aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/main/java
diff options
context:
space:
mode:
authorGravatar ajmichael <ajmichael@google.com>2017-04-12 01:34:08 +0000
committerGravatar Jakob Buchgraber <buchgr@google.com>2017-04-12 11:49:11 +0200
commit8d876cf3ac18a0563828f4d66a48b84c957c55fb (patch)
treefcd135c9a144ab4774c20e93a9a71fa8751e5585 /src/main/java
parent2e1b904c3016409ad30a289a796a4711476b9814 (diff)
Make android_sdk_repository generate filegroups containing system image files for all android system images installed in the SDK. For system images that are not installed, create genrule "poison pills" that print a helpful error message if you attempt to build them.
These filegroups are intended to be used as the system_image attribute of the android_device rule. Example: $ bazel build @android_test_support//tools/android/emulated_devices/pixel:android_25_x86 Extracting Bazel installation... . INFO: Found 1 target... ERROR: /usr/local/google/home/ajmichael/.cache/bazel/_bazel_ajmichael/efa32264346ef1fc4fec492202b88b31/external/androidsdk/BUILD.bazel:56:1: Executing genrule @androidsdk//:emulator_images_android_25_x86 failed: Process exited with status 1 [sandboxed]. This rule requires that the Android SDK used by Bazel has the following system image installed: emulator_images_android_25_x86. Please install this system image through the Android SDK Manager and try again. RELNOTES: None PiperOrigin-RevId: 152889824
Diffstat (limited to 'src/main/java')
-rw-r--r--src/main/java/com/google/devtools/build/lib/bazel/rules/android/android_sdk_repository_template.txt6
1 files changed, 3 insertions, 3 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 cab75e8baa..a2663c719c 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
@@ -2,8 +2,8 @@ package(default_visibility = ["//visibility:public"])
load(
"@bazel_tools//tools/android:android_sdk_repository_template.bzl",
- "create_android_device_rules",
- "create_android_sdk_rules")
+ "create_android_sdk_rules",
+ "create_system_images_filegroups")
create_android_sdk_rules(
name = "%repository_name%",
@@ -53,7 +53,7 @@ filegroup(
srcs = ["."],
)
-create_android_device_rules(
+create_system_images_filegroups(
system_image_dirs = [
%system_image_dirs% ],
)