diff options
| author |  corysmith <corysmith@google.com> | 2017-06-26 17:10:40 +0200 |
|---|---|---|
| committer |  Marcel Hlopko <hlopko@google.com> | 2017-06-26 18:43:08 +0200 |
| commit | 5be05aa4c8f140391ef2196dd3762a908bd4cf93 (patch) | |
| tree | e1b415b8c27b22826ab2faef7de7b30062707366 /src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java | |
| parent | c9ab594c1f9334fa20e70a9ec1bc0414c10d74a6 (diff) | |
Enabling Aapt2 processing:
* Add a new aapt_version attribute to android_binary
* Add a new android_aapt_version flag to control the version of aapt used.
* Add a new implicit output for aapt2 produced static libraries.
* Add a new implicit output for aapt2 produced .flat files zip.
RELNOTES:
New property on android_sdk: aapt2
Choose the version of aapt on android_binary
PiperOrigin-RevId: 160145530
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/android/AndroidSdk.java | 2 |
1 files changed, 2 insertions, 0 deletions
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 07b88a298b..164989c8a2 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 @@ -46,6 +46,7 @@ public class AndroidSdk implements RuleConfiguredTargetFactory { .get("build_tools_version", Type.STRING); FilesToRunProvider aidl = ruleContext.getExecutablePrerequisite("aidl", Mode.HOST); FilesToRunProvider aapt = ruleContext.getExecutablePrerequisite("aapt", Mode.HOST); + FilesToRunProvider aapt2 = ruleContext.getExecutablePrerequisite("aapt2", Mode.HOST); FilesToRunProvider apkBuilder = ruleContext.getExecutablePrerequisite( "apkbuilder", Mode.HOST); FilesToRunProvider apkSigner = ruleContext.getExecutablePrerequisite("apksigner", Mode.HOST); @@ -85,6 +86,7 @@ public class AndroidSdk implements RuleConfiguredTargetFactory { mainDexListCreator, aidl, aapt, + aapt2, apkBuilder, apkSigner, proguard, |