diff options
author | 2017-12-21 12:28:14 -0800 | |
---|---|---|
committer | 2017-12-21 12:30:19 -0800 | |
commit | 2d1406c9fed6bd97ff5e17680aa1968fe28661a2 (patch) | |
tree | a01f0adb4c0142a774dc5771c758ea81fed55eba /src/main/java | |
parent | c00cbd4215db1fcf649cc687a28ede5586854943 (diff) |
Remove android_resources and "resources" attribute
RELNOTES: none
PiperOrigin-RevId: 179844898
Diffstat (limited to 'src/main/java')
3 files changed, 0 insertions, 24 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java index 46b5c0e063..4d957a9e19 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/BazelAndroidSemantics.java @@ -22,9 +22,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.rules.android.AndroidBinary; import com.google.devtools.build.lib.rules.android.AndroidCommon; import com.google.devtools.build.lib.rules.android.AndroidConfiguration; -import com.google.devtools.build.lib.rules.android.AndroidIdeInfoProvider; import com.google.devtools.build.lib.rules.android.AndroidSemantics; -import com.google.devtools.build.lib.rules.android.ResourceApk; import com.google.devtools.build.lib.rules.java.JavaCompilationArtifacts; import com.google.devtools.build.lib.rules.java.JavaSemantics; import com.google.devtools.build.lib.rules.java.JavaTargetAttributes.Builder; @@ -40,12 +38,6 @@ public class BazelAndroidSemantics implements AndroidSemantics { } @Override - public void addNonLocalResources( - RuleContext ruleContext, - ResourceApk resourceApk, - AndroidIdeInfoProvider.Builder ideInfoProviderBuilder) {} - - @Override public String getNativeDepsFileName() { return "nativedeps"; } 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 d632c01dc9..8470dffe18 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 @@ -286,8 +286,6 @@ public class AndroidCommon { .setManifest(ruleContext.getPrerequisiteArtifact("manifest", Mode.TARGET)) .setJavaPackage(getJavaPackage(ruleContext)) .setResourceApk(resourceApk.getArtifact()); - } else { - semantics.addNonLocalResources(ruleContext, resourceApk, ideInfoProviderBuilder); } return ideInfoProviderBuilder.build(); 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 be646c3b8b..0eb1501234 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 @@ -25,7 +25,6 @@ import com.google.devtools.build.lib.rules.java.JavaCompilationArtifacts; import com.google.devtools.build.lib.rules.java.JavaSemantics; import com.google.devtools.build.lib.rules.java.JavaTargetAttributes; import com.google.devtools.build.lib.rules.java.ProguardHelper.ProguardOutput; -import javax.annotation.Nullable; /** * Pluggable semantics for Android rules. @@ -34,19 +33,6 @@ import javax.annotation.Nullable; * to keep state. */ public interface AndroidSemantics { - - /** - * Add additional resources to IDE info for {@code android_binary} and {@code android_library} - * - * @param ruleContext rule context for target rule - * @param resourceApk resource apk directly provided by the rule - * @param ideInfoProviderBuilder - */ - void addNonLocalResources( - RuleContext ruleContext, - @Nullable ResourceApk resourceApk, - AndroidIdeInfoProvider.Builder ideInfoProviderBuilder); - /** * Returns the manifest to be used when compiling a given rule. * |