diff options
Diffstat (limited to 'src')
4 files changed, 4 insertions, 13 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java index c9b0f4f6de..790810747a 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidConfiguration.java @@ -425,7 +425,7 @@ public class AndroidConfiguration extends BuildConfiguration.Fragment { @Option(name = "apk_signing_method", converter = ApkSigningMethodConverter.class, - defaultValue = "legacy_v1", + defaultValue = "v1", category = "undocumented", help = "Implementation to use to sign APKs") public ApkSigningMethod apkSigningMethod; diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java index 4b68f53115..0efb3dc191 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java @@ -363,7 +363,7 @@ public final class AndroidRuleClasses { .add(attr("annotations_jar", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE)) .add(attr("main_dex_classes", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE)) .add(attr("apkbuilder", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE).exec()) - .add(attr("apksigner", LABEL).cfg(HOST).allowedFileTypes(ANY_FILE).exec()) + .add(attr("apksigner", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE).exec()) .add(attr("zipalign", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE).exec()) .add( attr("jack", LABEL) diff --git a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java index 228a51818c..6e22e81409 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java +++ b/src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java @@ -27,9 +27,7 @@ import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.collect.nestedset.NestedSetBuilder; import com.google.devtools.build.lib.collect.nestedset.Order; import com.google.devtools.build.lib.packages.AggregatingAttributeMapper; -import com.google.devtools.build.lib.packages.RuleClass.ConfiguredTargetFactory.RuleErrorException; import com.google.devtools.build.lib.rules.RuleConfiguredTargetFactory; -import com.google.devtools.build.lib.rules.android.AndroidConfiguration.ApkSigningMethod; import com.google.devtools.build.lib.rules.java.BaseJavaCompilationHelper; import com.google.devtools.build.lib.rules.java.JavaConfiguration; import com.google.devtools.build.lib.rules.java.JavaToolchainProvider; @@ -69,12 +67,7 @@ public class AndroidSdk implements RuleConfiguredTargetFactory { FilesToRunProvider apkBuilder = ruleContext.getExecutablePrerequisite( "apkbuilder", Mode.HOST); FilesToRunProvider apkSigner = ruleContext.getExecutablePrerequisite("apksigner", Mode.HOST); - ApkSigningMethod apkSigningMethod = - ruleContext.getFragment(AndroidConfiguration.class).getApkSigningMethod(); - if (apkSigner == null && !apkSigningMethod.signLegacy()) { - ruleContext.throwWithRuleError( - "android_sdk attribute apksigner must be set to use signing method " + apkSigningMethod); - } + FilesToRunProvider adb = ruleContext.getExecutablePrerequisite("adb", Mode.HOST); FilesToRunProvider dx = ruleContext.getExecutablePrerequisite("dx", Mode.HOST); FilesToRunProvider mainDexListCreator = ruleContext.getExecutablePrerequisite( 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 da82a92d45..5877181e27 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 @@ -22,7 +22,6 @@ import com.google.devtools.build.lib.analysis.TransitiveInfoCollection; import com.google.devtools.build.lib.analysis.TransitiveInfoProvider; import com.google.devtools.build.lib.collect.nestedset.NestedSet; import com.google.devtools.build.lib.concurrent.ThreadSafety.Immutable; -import javax.annotation.Nullable; /** Description of the tools Blaze needs from an Android SDK. */ @AutoValue @@ -45,7 +44,7 @@ public abstract class AndroidSdkProvider implements TransitiveInfoProvider { FilesToRunProvider aidl, FilesToRunProvider aapt, FilesToRunProvider apkBuilder, - @Nullable FilesToRunProvider apkSigner, + FilesToRunProvider apkSigner, FilesToRunProvider proguard, FilesToRunProvider zipalign, FilesToRunProvider jack, @@ -141,7 +140,6 @@ public abstract class AndroidSdkProvider implements TransitiveInfoProvider { public abstract FilesToRunProvider getApkBuilder(); - @Nullable public abstract FilesToRunProvider getApkSigner(); public abstract FilesToRunProvider getProguard(); |