commit a52e65a07f92f65eca495b21e1335bab5f7e6b71
author ahumesky <ahumesky@google.com> Thu Jul 11 14:25:11 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Jul 11 14:26:08 2019 -0700
tree dd0b600eca203739cdda0f69b20721dd78b9cac4
parent 5fa247096a687082496cb3f63b7c194e2da1fc80

Add __ANDROID_RULES_MIGRATION__ to the tags for the generated android_sdk from
the android_sdk_repository workspace rule so that it works with
--incompatible_disable_native_android_rules. Fixes #8757.

RELNOTES: None.
PiperOrigin-RevId: 257681737

tools/android/android_sdk_repository_template.bzl

diff --git a/tools/android/android_sdk_repository_template.bzl b/tools/android/android_sdk_repository_template.bzl
index 5c92c54..1998448 100644
--- a/tools/android/android_sdk_repository_template.bzl
+++ b/tools/android/android_sdk_repository_template.bzl
@@ -135,6 +135,8 @@
                 ":windows": "build-tools/%s/zipalign.exe" % build_tools_directory,
                 "//conditions:default": ":zipalign_binary",
             }),
+            # See https://github.com/bazelbuild/bazel/issues/8757
+            tags = ["__ANDROID_RULES_MIGRATION__"],
         )
 
     native.alias(