From bc6f7cb330bb531f062bb301f3703876051191f5 Mon Sep 17 00:00:00 2001 From: Jingwen Chen Date: Thu, 30 May 2019 10:00:01 -0700 Subject: [PATCH] Export more files in androidsdk This allows Android rule writers to access more file targets in `@androidsdk` directly. Closes #7823. Change-Id: I535b03f62709763cc35f3936e07562e195a9979b PiperOrigin-RevId: 250707568 --- .../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 07381cb82d3023..31bfd4e7b230d6 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"] + select({ + srcs = ["emulator/emulator"] + glob(["emulator/lib64/**", "emulator/lib/**"]) + 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/**"])) +%exported_files%] + glob(["system-images/**", "tools/**", "emulator/**"]))