Add @CompileTimeConstant annotations to CustomCommandLine.

This enforces certain memory-efficient patterns. For deliberate use of dynamic strings, explicitly named overloads are introduced, with javadoc that guides the programmer into making the right choice.

This CL is a memory no-op on benchmarks, but it tries to prevent backslide by making sure programmers make conscious choices when they construct their command lines.

RELNOTES: None
PiperOrigin-RevId: 165185997

1 files changed, 3 insertions, 4 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java
index 99f4b90a70..a68c2610e3 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidResourceParsingActionBuilder.java
@@ -136,7 +136,7 @@ public class AndroidResourceParsingActionBuilder {
 
     Preconditions.checkNotNull(primary);
     String resourceDirectories = RESOURCE_CONTAINER_TO_ARG.apply(primary);
-    builder.add("--primaryData").add(resourceDirectories);
+    builder.add("--primaryData", resourceDirectories);
     inputs.addTransitive(RESOURCE_CONTAINER_TO_ARTIFACTS.apply(primary));
 
     Preconditions.checkNotNull(output);
@@ -177,8 +177,7 @@ public class AndroidResourceParsingActionBuilder {
           .add("--tool")
           .add("COMPILE_LIBRARY_RESOURCES")
           .add("--")
-          .add("--resources")
-          .add(resourceDirectories)
+          .add("--resources", resourceDirectories)
           .add("--output", compiledSymbols);
       outs.add(compiledSymbols);
 
@@ -187,7 +186,7 @@ public class AndroidResourceParsingActionBuilder {
         flatFileBuilder.add("--manifest", resourceContainer.getManifest());
         inputs.add(resourceContainer.getManifest());
         if (!Strings.isNullOrEmpty(resourceContainer.getJavaPackage())) {
-          flatFileBuilder.add("--packagePath").add(resourceContainer.getJavaPackage());
+          flatFileBuilder.add("--packagePath", resourceContainer.getJavaPackage());
         }
         builder.add("--dataBindingInfoOut", dataBindingInfoZip);
         outs.add(dataBindingInfoZip);