Skip to content

Commit

Permalink
Automated rollback of commit bc6f7cb.
Browse files Browse the repository at this point in the history
*** Reason for rollback ***

Breaks running android_device targets

Fixes bazel-contrib/rules_jvm_external#165
Fixes android/testing-samples#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 bazelbuild#7823.

PiperOrigin-RevId: 252095582
  • Loading branch information
jin authored and irengrig committed Jul 15, 2019
1 parent 5db4efb commit eb2c8a2
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
Expand All @@ -70,4 +70,4 @@ create_system_images_filegroups(
)

exports_files([
%exported_files%] + glob(["system-images/**", "tools/**", "emulator/**"]))
%exported_files%] + glob(["system-images/**"]))

0 comments on commit eb2c8a2

Please sign in to comment.