From 1be84ee92a825694b0c0026ac77134f8a084bd9c Mon Sep 17 00:00:00 2001 From: lpino Date: Tue, 6 Jun 2017 13:42:41 -0400 Subject: 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: 158159550 --- .../lib/rules/android/AndroidLocalTestBase.java | 12 --- .../RobolectricResourceSymbolsActionBuilder.java | 114 --------------------- .../build/android/RClassGeneratorAction.java | 1 + 3 files changed, 1 insertion(+), 126 deletions(-) delete mode 100644 src/main/java/com/google/devtools/build/lib/rules/android/RobolectricResourceSymbolsActionBuilder.java (limited to 'src') 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 0760442511..09180a6ff0 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,18 +82,6 @@ public abstract class AndroidLocalTestBase implements RuleConfiguredTargetFactor // 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 deleted file mode 100644 index 20fe4104fd..0000000000 --- a/src/main/java/com/google/devtools/build/lib/rules/android/RobolectricResourceSymbolsActionBuilder.java +++ /dev/null @@ -1,114 +0,0 @@ -// 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. - * - *

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 buildAsClassPathEntry(RuleContext ruleContext) { - CustomCommandLine.Builder builder = new CustomCommandLine.Builder(); - // Set the busybox tool. - builder.add("--tool").add("GENERATE_ROBOLECTRIC_R").add("--"); - - List 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.naiveLinkOrder().add(classJarOut).build(); - } -} 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 4fb15a52d8..ebc89df41f 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,6 +34,7 @@ import java.util.List; 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.). -- cgit v1.2.3