diff options
| author |  Adam Michael <ajmichael@google.com> | 2016-08-31 23:44:59 +0000 |
|---|---|---|
| committer |  Klaus Aehlig <aehlig@google.com> | 2016-09-01 08:39:36 +0000 |
| commit | 602f3ae70f49bd8bae6205a93f3df5918d3bacac (patch) | |
| tree | a255b0eaa3c1888ed2422b1737e06d6ba014c04a /src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java | |
| parent | 60a7e633a2ecd239794ebc4067de48d68de549ce (diff) | |
Adds support for ApkSignerTool and APK signature schema v2 behind --apk_signing_method flag. Default is legacy_v1 which is the already existing functionality.
Promotes AndroidBinary.ApkActionBuilder to a toplevel abstract class ApkActionsBuilder with two implementations, one for default signing/zipaligning and one for ApkSignerTool based signing/zipaligning. In addition to build the action for constructing the APK, it now responsible for orchestrating the various tools to build, sign and zipalign the APK.
--
MOS_MIGRATED_REVID=131889338
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidRuleClasses.java | 1 |
1 files changed, 1 insertions, 0 deletions
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 7582f81564..ac641ce419 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 @@ -359,6 +359,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("zipalign", LABEL).mandatory().cfg(HOST).allowedFileTypes(ANY_FILE).exec()) .add( attr("jack", LABEL) |