From e619d6a54aa44585305c5feced5cb512f230b1bc Mon Sep 17 00:00:00 2001
From: ajmichael <ajmichael@google.com>
Date: Mon, 24 Jul 2017 18:16:13 +0200
Subject: [PATCH] Distinguish mnemonics between different usages of aapt.

RELNOTES: None
PiperOrigin-RevId: 162945309
---
 .../build/lib/rules/android/AndroidAaptActionHelper.java  | 8 ++++----
 .../devtools/build/lib/rules/android/AndroidBinary.java   | 2 +-
 .../rules/android/AndroidResourcesProcessorBuilder.java   | 4 ++--
 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 b94f2de4ba76c1..3a5d8d35ceffc5 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 void createGenerateResourceSymbolsAction(Artifact javaSourcesJar,
             .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 void createGenerateApkAction(Artifact apk, String renameManifestPackage,
             .setCommandLine(CommandLine.of(args))
             .useParameterFile(ParameterFileType.UNQUOTED)
             .setProgressMessage("Generating apk resources")
-            .setMnemonic("AndroidAapt")
+            .setMnemonic("AaptResourceApk")
             .build(ruleContext));
   }
 
@@ -218,7 +218,7 @@ public List<String> getArgs(Artifact output, String actionKind, ResourceType res
     if (args.size() > 3) {
       return ImmutableList.copyOf(args);
     } else {
-      return ImmutableList.<String>of();
+      return ImmutableList.of();
     }
   }
 
@@ -280,7 +280,7 @@ public void createGenerateProguardAction(
             .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 3eff2e482bf039..48524e84dce5c0 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 @@ private static Artifact createSplitApkResources(RuleContext ruleContext,
     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 8bca6ba9967d88..5113ff5cb9dcf1 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 @@ private ResourceContainer createAaptAction(ActionConstructionContext context) {
             .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.