diff options
3 files changed, 12 insertions, 12 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java index 4713a4722a..ede1889c6f 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidIdlHelper.java @@ -17,6 +17,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.actions.Artifact; import com.google.devtools.build.lib.actions.ParameterFile.ParameterFileType; +import com.google.devtools.build.lib.analysis.OutputGroupProvider; import com.google.devtools.build.lib.analysis.RuleConfiguredTargetBuilder; import com.google.devtools.build.lib.analysis.RuleContext; import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; @@ -47,6 +48,13 @@ import javax.annotation.Nullable; */ public class AndroidIdlHelper { + /** + * Name of the output group used for idl jars (the jars containing the class files for sources + * generated from annotation processors). + */ + static final String IDL_JARS_OUTPUT_GROUP = + OutputGroupProvider.HIDDEN_OUTPUT_GROUP_PREFIX + "idl_jars"; + private final RuleContext ruleContext; private final AndroidIdlProvider androidIdlProvider; private final Map<Artifact, Artifact> translatedIdlSources; @@ -102,9 +110,8 @@ public class AndroidIdlHelper { manifestProtoOutput, idlClassJar, idlSourceJar); } builder - .add(AndroidIdlProvider.class, androidIdlProvider) - .addOutputGroup( - AndroidSemantics.IDL_JARS_OUTPUT_GROUP, androidIdlProvider.getTransitiveIdlJars()); + .addProvider(AndroidIdlProvider.class, androidIdlProvider) + .addOutputGroup(IDL_JARS_OUTPUT_GROUP, androidIdlProvider.getTransitiveIdlJars()); } /** diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java index 1792b55b09..1a42e03aed 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSemantics.java @@ -15,7 +15,6 @@ package com.google.devtools.build.lib.rules.android; import com.google.common.collect.ImmutableList; import com.google.devtools.build.lib.actions.Artifact; -import com.google.devtools.build.lib.analysis.OutputGroupProvider; 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; @@ -33,12 +32,6 @@ import javax.annotation.Nullable; * to keep state. */ public interface AndroidSemantics { - /** - * Name of the output group used for idl jars (the jars containing the class files for sources - * generated from annotation processors). - */ - String IDL_JARS_OUTPUT_GROUP = - OutputGroupProvider.HIDDEN_OUTPUT_GROUP_PREFIX + "idl_jars"; /** * Add additional resources to IDE info for {@code android_binary} and {@code android_library} diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java index 02cf5ef73f..82e41fbdc8 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/AndroidLibraryTest.java @@ -489,7 +489,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { ConfiguredTarget idlTarget = getConfiguredTarget("//java/android:idl"); NestedSet<Artifact> outputGroup = - getOutputGroup(idlTarget, AndroidSemantics.IDL_JARS_OUTPUT_GROUP); + getOutputGroup(idlTarget, AndroidIdlHelper.IDL_JARS_OUTPUT_GROUP); SpawnAction classJarAction = (SpawnAction) actionsTestUtil().getActionForArtifactEndingWith( actionsTestUtil().artifactClosureOf(outputGroup), "libidl-idl.jar"); @@ -520,7 +520,7 @@ public class AndroidLibraryTest extends AndroidBuildViewTestCase { ConfiguredTarget idlTarget = getConfiguredTarget("//java/android:lib"); NestedSet<Artifact> outputGroup = - getOutputGroup(idlTarget, AndroidSemantics.IDL_JARS_OUTPUT_GROUP); + getOutputGroup(idlTarget, AndroidIdlHelper.IDL_JARS_OUTPUT_GROUP); List<String> asString = Lists.newArrayList(); for (Artifact artifact : outputGroup) { asString.add(artifact.getRootRelativePathString()); |