diff options
author | 2017-07-24 18:16:13 +0200 | |
---|---|---|
committer | 2017-07-24 21:04:44 +0200 | |
commit | e619d6a54aa44585305c5feced5cb512f230b1bc (patch) | |
tree | 3b909f1e12580e050ed71352d29b23bbf39fb3a8 /src/main/java | |
parent | ad42824ae02a1b2edbffe475246984e14af56dd0 (diff) |
Distinguish mnemonics between different usages of aapt.
RELNOTES: None
PiperOrigin-RevId: 162945309
Diffstat (limited to 'src/main/java')
3 files changed, 7 insertions, 7 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java index b94f2de4ba..3a5d8d35ce 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidAaptActionHelper.java @@ -111,7 +111,7 @@ public final class AndroidAaptActionHelper { .setCommandLine(CommandLine.of(args)) .useParameterFile(ParameterFileType.UNQUOTED) .setProgressMessage("Generating Java resources") - .setMnemonic("AndroidAapt"); + .setMnemonic("AaptJavaGenerator"); if (rTxt != null) { builder.addOutput(rTxt); } @@ -152,7 +152,7 @@ public final class AndroidAaptActionHelper { .setCommandLine(CommandLine.of(args)) .useParameterFile(ParameterFileType.UNQUOTED) .setProgressMessage("Generating apk resources") - .setMnemonic("AndroidAapt") + .setMnemonic("AaptResourceApk") .build(ruleContext)); } @@ -218,7 +218,7 @@ public final class AndroidAaptActionHelper { if (args.size() > 3) { return ImmutableList.copyOf(args); } else { - return ImmutableList.<String>of(); + return ImmutableList.of(); } } @@ -280,7 +280,7 @@ public final class AndroidAaptActionHelper { .setCommandLine(CommandLine.of(aaptCommand)) .useParameterFile(ParameterFileType.UNQUOTED) .setProgressMessage("Generating Proguard configuration for resources") - .setMnemonic("AndroidAapt") + .setMnemonic("AaptProguardConfiguration") .build(ruleContext)); } } diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java index 3eff2e482b..48524e84dc 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidBinary.java @@ -1732,7 +1732,7 @@ public abstract class AndroidBinary implements RuleConfiguredTargetFactory { AndroidSdkProvider sdk = AndroidSdkProvider.fromRuleContext(ruleContext); ruleContext.registerAction(new SpawnAction.Builder() .setExecutable(sdk.getAapt()) - .setMnemonic("AndroidAapt") + .setMnemonic("AaptSplitResourceApk") .setProgressMessage("Generating resource apk for split " + splitName) .addArgument("package") .addArgument("-F") diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java index 8bca6ba996..5113ff5cb9 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourcesProcessorBuilder.java @@ -337,12 +337,12 @@ public class AndroidResourcesProcessorBuilder { .useParameterFile(ParameterFileType.UNQUOTED) .addTool(sdk.getAapt()) .addTransitiveInputs(inputs.build()) - .addOutputs(ImmutableList.<Artifact>copyOf(outs)) + .addOutputs(ImmutableList.copyOf(outs)) .setCommandLine(builder.build()) .setExecutable( ruleContext.getExecutablePrerequisite("$android_resources_busybox", Mode.HOST)) .setProgressMessage("Processing Android resources for " + ruleContext.getLabel()) - .setMnemonic("AndroidAapt") + .setMnemonic("AaptPackage") .build(context)); // Return the full set of processed transitive dependencies. |