From e2a626c4f61fe4ceb79a5675d09a6f25ca7b5b22 Mon Sep 17 00:00:00 2001 From: jingwen Date: Fri, 7 Jun 2019 12:17:15 -0700 Subject: [PATCH] Automated rollback of commit bc6f7cb330bb531f062bb301f3703876051191f5. *** Reason for rollback *** Breaks running android_device targets Fixes https://github.com/bazelbuild/rules_jvm_external/issues/165 Fixes https://github.com/googlesamples/android-testing/issues/279 Needs to be cherrypicked into 0.27.0rc *** Original change description *** Export more files in androidsdk This allows Android rule writers to access more file targets in `@androidsdk` directly. Closes #7823. PiperOrigin-RevId: 252095582 --- .../bazel/rules/android/android_sdk_repository_template.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt index 31bfd4e7b230d6..07381cb82d3023 100644 --- a/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt +++ b/src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt @@ -57,7 +57,7 @@ filegroup( filegroup( name = "qemu2_x86", - srcs = ["emulator/emulator"] + glob(["emulator/lib64/**", "emulator/lib/**"]) + select({ + srcs = ["emulator/emulator"] + select({ "@bazel_tools//src/conditions:darwin": ["emulator/qemu/darwin-x86_64/qemu-system-i386"], "@bazel_tools//src/conditions:darwin_x86_64": ["emulator/qemu/darwin-x86_64/qemu-system-i386"], "//conditions:default": ["emulator/qemu/linux-x86_64/qemu-system-i386"], @@ -70,4 +70,4 @@ create_system_images_filegroups( ) exports_files([ -%exported_files%] + glob(["system-images/**", "tools/**", "emulator/**"])) +%exported_files%] + glob(["system-images/**"]))