Fix analysis performance regression caused by header compilation

When building --direct_dependency/--indirect_dependency args, use a set for the
direct jars to avoid an O(n) contains check, and make the CustomMultiArgv class
static to avoid a memory leak. Also avoid flattening the NestedSet of direct
jars for as long as possible.

--
MOS_MIGRATED_REVID=125468789

1 files changed, 3 insertions, 2 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
index 870cee733a..edc438dbb3 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidCommon.java
@@ -375,8 +375,9 @@ public class AndroidCommon {
       ImmutableList.Builder<Artifact> jarsProducedForRuntime) throws InterruptedException {
     compileResourceJar(javaSemantics, resourcesJar);
     // Add the compiled resource jar to the classpath of the main compilation.
-    attributes.addDirectJars(ImmutableList.of(resourceClassJar));
-    attributes.addDirectCompileTimeClassPathEntries(ImmutableList.of(resourceClassJar));
+    NestedSet<Artifact> directJars = NestedSetBuilder.create(Order.STABLE_ORDER, resourceClassJar);
+    attributes.addDirectJars(directJars);
+    attributes.addCompileTimeClassPathEntries(directJars);
     // Add the compiled resource jar to the classpath of consuming targets.
     artifactsBuilder.addCompileTimeJar(resourceClassJar);
     // Combined resource constants needs to come even before our own classes that may contain