diff options
author | ajmichael <ajmichael@google.com> | 2017-06-29 04:14:19 +0200 |
---|---|---|
committer | Marcel Hlopko <hlopko@google.com> | 2017-06-29 09:34:03 +0200 |
commit | 393e843eabac50c01e245ca6c357c10085d08b5b (patch) | |
tree | bd758100d203779ef92f52c35badc15047a33a3c /src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java | |
parent | b5873507768ae6a3995480dc820ab904841d2a9a (diff) |
Remove resource_extractor from android_sdk rule.
resource_extractor has nothing to do with the Android SDK. Once upon a time, it
was needed for jack support, so it was colocated with the jack attributes in
android_sdk. Nowadays, it is used as a necessary step before singlejar can run
to build the APK.
RELNOTES: None
PiperOrigin-RevId: 160479247
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java')
-rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java index 30880f0e5d..0a73a954f5 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdkProvider.java @@ -45,8 +45,7 @@ public abstract class AndroidSdkProvider implements TransitiveInfoProvider { @Nullable FilesToRunProvider apkBuilder, FilesToRunProvider apkSigner, FilesToRunProvider proguard, - FilesToRunProvider zipalign, - FilesToRunProvider resourceExtractor) { + FilesToRunProvider zipalign) { return new AutoValue_AndroidSdkProvider( buildToolsVersion, @@ -65,8 +64,7 @@ public abstract class AndroidSdkProvider implements TransitiveInfoProvider { apkBuilder, apkSigner, proguard, - zipalign, - resourceExtractor); + zipalign); } /** @@ -133,7 +131,5 @@ public abstract class AndroidSdkProvider implements TransitiveInfoProvider { public abstract FilesToRunProvider getZipalign(); - public abstract FilesToRunProvider getResourceExtractor(); - AndroidSdkProvider() {} } |