Add aapt2 to Bazel-generated android_sdks.

RELNOTES: None PiperOrigin-RevId: 172481590
jvican · Oct 18, 2017 · 0f8a9b8 · 0f8a9b8
1 parent 85b7af7
commit 0f8a9b8
Showing 1 changed file with 7 additions and 1 deletion.
diff --git 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"],