diff options
| author |  ajmichael <ajmichael@google.com> | 2017-10-17 19:15:51 +0200 |
|---|---|---|
| committer |  Jakob Buchgraber <buchgr@google.com> | 2017-10-18 10:28:21 +0200 |
| commit | 0f8a9b82fe0dd2c26cc1c89c27c96d9077a7f91f (patch) | |
| tree | d1f5efbc31797b2633f041665f343bb94eb0bd0c /tools/android | |
| parent | 85b7af7dd58d331667205dfa7ea8a0f221218bea (diff) | |
Add aapt2 to Bazel-generated android_sdks.
RELNOTES: None
PiperOrigin-RevId: 172481590
Diffstat (limited to 'tools/android')
| -rw-r--r-- | tools/android/android_sdk_repository_template.bzl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/android/android_sdk_repository_template.bzl b/tools/android/android_sdk_repository_template.bzl index 3958045a22..7412aa67dc 100644 --- a/tools/android/android_sdk_repository_template.bzl +++ b/tools/android/android_sdk_repository_template.bzl @@ -103,6 +103,12 @@ def create_android_sdk_rules( ":windows_msys": "build-tools/%s/aapt.exe" % build_tools_directory, "//conditions:default": ":aapt_binary", }), + aapt2 = select({ + ":windows": "build-tools/%s/aapt2.exe" % build_tools_directory, + ":windows_msvc": "build-tools/%s/aapt2.exe" % build_tools_directory, + ":windows_msys": "build-tools/%s/aapt2.exe" % build_tools_directory, + "//conditions:default": ":aapt2_binary", + }), dx = ":dx_binary", main_dex_list_creator = ":main_dex_list_creator", adb = select({ @@ -156,7 +162,7 @@ def create_android_sdk_rules( ]) ) - for tool in ["aapt", "aidl", "zipalign"]: + for tool in ["aapt", "aapt2", "aidl", "zipalign"]: native.genrule( name = tool + "_runner", outs = [tool + "_runner.sh"], |