Automated g4 rollback of commit 1be84ee92a825694b0c0026ac77134f8a084bd9c.
*** Reason for rollback ***
Rolling forward with the generated resources directory being created for tests without resources.
*** Original change description ***
Automated g4 rollback of commit d028d7854d3e95d97143945a1ec32944e5e4594b.
*** Reason for rollback ***
Breaks 1000+ targets in the depot: []
*** Original change description ***
Generate pre-reconciled ids R classes for dependency libraries with resources
in the transitive closure of robolectric tests.
RELNOTES: None
PiperOrigin-RevId: 158756991
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
index 09180a6..0760442 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidLocalTestBase.java
@@ -82,6 +82,18 @@
// since they run on a JVM, not an android device.
JavaTargetAttributes.Builder attributesBuilder = javaCommon.initCommon();
+ // Add reconciled R classes for all dependencies with resources to the classpath before the
+ // dependency jars. Must use a NestedSet to have it appear in the correct place on the
+ // classpath.
+ attributesBuilder.addRuntimeClassPathEntries(
+ RobolectricResourceSymbolsActionBuilder.create(
+ ResourceDependencies.fromRuleDeps(ruleContext, false))
+ .setSdk(AndroidSdkProvider.fromRuleContext(ruleContext))
+ .setJarOut(
+ ruleContext.getImplicitOutputArtifact(
+ AndroidRuleClasses.ANDROID_RESOURCES_CLASS_JAR))
+ .buildAsClassPathEntry(ruleContext));
+
String testClass =
getAndCheckTestClass(ruleContext, ImmutableList.copyOf(attributesBuilder.getSourceFiles()));
getAndCheckTestSupport(ruleContext);
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/RobolectricResourceSymbolsActionBuilder.java b/src/main/java/com/google/devtools/build/lib/rules/android/RobolectricResourceSymbolsActionBuilder.java
new file mode 100644
index 0000000..20fe410
--- /dev/null
+++ b/src/main/java/com/google/devtools/build/lib/rules/android/RobolectricResourceSymbolsActionBuilder.java
@@ -0,0 +1,114 @@
+// Copyright 2017 The Bazel Authors. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+package com.google.devtools.build.lib.rules.android;
+
+import com.google.common.collect.FluentIterable;
+import com.google.common.collect.Iterables;
+import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType;
+import com.google.devtools.build.lib.analysis.RuleConfiguredTarget.Mode;
+import com.google.devtools.build.lib.analysis.RuleContext;
+import com.google.devtools.build.lib.analysis.actions.CustomCommandLine;
+import com.google.devtools.build.lib.analysis.actions.SpawnAction;
+import com.google.devtools.build.lib.collect.nestedset.NestedSet;
+import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder;
+import com.google.devtools.build.lib.rules.android.ResourceContainerConverter.Builder.SeparatorType;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Builder for generating R classes for robolectric action.
+ *
+ * <p>This builder will create an action that generates r classes with internally consistent
+ * resource ids for the transitive closure of dependencies that provide resources.
+ */
+public class RobolectricResourceSymbolsActionBuilder {
+
+ private static final ResourceContainerConverter.ToArtifacts RESOURCE_CONTAINER_TO_ARTIFACTS =
+ ResourceContainerConverter.builder()
+ .includeResourceRoots()
+ .includeManifest()
+ .includeRTxt()
+ .includeSymbolsBin()
+ .toArtifactConverter();
+ private static final ResourceContainerConverter.ToArg RESOURCE_CONTAINER_TO_ARG =
+ ResourceContainerConverter.builder()
+ .includeResourceRoots()
+ .includeManifest()
+ .includeRTxt()
+ .includeSymbolsBin()
+ .withSeparator(SeparatorType.COLON_COMMA)
+ .toArgConverter();
+
+ private Artifact classJarOut;
+ private final ResourceDependencies dependencies;
+ private AndroidSdkProvider sdk;
+
+ private RobolectricResourceSymbolsActionBuilder(ResourceDependencies dependencies) {
+ this.dependencies = dependencies;
+ }
+
+ public static RobolectricResourceSymbolsActionBuilder create(ResourceDependencies dependencies) {
+ return new RobolectricResourceSymbolsActionBuilder(dependencies);
+ }
+
+ public RobolectricResourceSymbolsActionBuilder setJarOut(Artifact classJar) {
+ this.classJarOut = classJar;
+ return this;
+ }
+
+ public RobolectricResourceSymbolsActionBuilder setSdk(AndroidSdkProvider sdk) {
+ this.sdk = sdk;
+ return this;
+ }
+
+ public NestedSet<Artifact> buildAsClassPathEntry(RuleContext ruleContext) {
+ CustomCommandLine.Builder builder = new CustomCommandLine.Builder();
+ // Set the busybox tool.
+ builder.add("--tool").add("GENERATE_ROBOLECTRIC_R").add("--");
+
+ List<Artifact> inputs = new ArrayList<>();
+
+ builder.addExecPath("--androidJar", sdk.getAndroidJar());
+ inputs.add(sdk.getAndroidJar());
+
+ if (!Iterables.isEmpty(dependencies.getResources())) {
+ builder.addJoinValues(
+ "--data",
+ RESOURCE_CONTAINER_TO_ARG.listSeparator(),
+ dependencies.getResources(),
+ RESOURCE_CONTAINER_TO_ARG);
+ }
+
+ // This flattens the nested set.
+ Iterables.addAll(inputs, FluentIterable.from(dependencies.getResources())
+ .transformAndConcat(RESOURCE_CONTAINER_TO_ARTIFACTS));
+
+ builder.addExecPath("--classJarOutput", classJarOut);
+ SpawnAction.Builder spawnActionBuilder = new SpawnAction.Builder();
+ ruleContext.registerAction(
+ spawnActionBuilder
+ .useParameterFile(ParameterFileType.UNQUOTED)
+ .addInputs(inputs)
+ .addOutput(classJarOut)
+ .setCommandLine(builder.build())
+ .setExecutable(
+ ruleContext.getExecutablePrerequisite("$android_resources_busybox", Mode.HOST))
+ .setProgressMessage("Generating R classes for " + ruleContext.getLabel())
+ .setMnemonic("GenerateRobolectricRClasses")
+ .build(ruleContext));
+
+ return NestedSetBuilder.<Artifact>naiveLinkOrder().add(classJarOut).build();
+ }
+}
diff --git a/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java b/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java
index e95b646..0857fe3 100644
--- a/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/GenerateRobolectricResourceSymbolsAction.java
@@ -30,6 +30,7 @@
import com.google.devtools.common.options.OptionsParser;
import java.io.Closeable;
import java.nio.file.FileSystems;
+import java.nio.file.Files;
import java.nio.file.Path;
import java.util.ArrayList;
import java.util.List;
@@ -106,7 +107,7 @@
try (ScopedTemporaryDirectory scopedTmp =
new ScopedTemporaryDirectory("robolectric_resources_tmp")) {
Path tmp = scopedTmp.getPath();
- Path generatedSources = tmp.resolve("generated_resources");
+ Path generatedSources = Files.createDirectories(tmp.resolve("generated_resources"));
// The reported availableProcessors may be higher than the actual resources
// (on a shared system). On the other hand, a lot of the work is I/O, so it's not completely
// CPU bound. As a compromise, divide by 2 the reported availableProcessors.
diff --git a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
index ebc89df..4fb15a5 100644
--- a/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
+++ b/src/tools/android/java/com/google/devtools/build/android/RClassGeneratorAction.java
@@ -34,7 +34,6 @@
import java.util.concurrent.TimeUnit;
import java.util.logging.Logger;
-
/**
* Provides an entry point for the compiling resource classes using a custom compiler (simply parse
* R.txt and make a jar, which is simpler than parsing R.java and running errorprone, etc.).
