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/test/java/com/google | |
| 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/test/java/com/google')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java b/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java index 63d0589c93..4abdc5c4e7 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/android/ApkManifestActionTest.java @@ -53,7 +53,7 @@ public class ApkManifestActionTest { AndroidSdkProvider.create( "24.0.3", createArtifact("/workspace/androidsdk/frameworkAidl"), - null, // aidlLib, optional + null, // aidlLib, optional createArtifact("/workspace/androidsdk/androidJar"), createArtifact("/workspace/androidsdk/shrinkedAndroidJar"), createArtifact("/workspace/androidsdk/annotationsJar"), @@ -63,7 +63,8 @@ public class ApkManifestActionTest { createFilesToRunProvider("mainDexListCreator"), createFilesToRunProvider("aidl"), createFilesToRunProvider("aapt"), - /* apkBuilder = */ null, + createFilesToRunProvider("aapt2"), + null, // apkBuilder, optional createFilesToRunProvider("apkSigner"), createFilesToRunProvider("proguard"), createFilesToRunProvider("zipalign"), |