Make android_device pass --android_sdk_path to unified launcher. Creates filegroup containing sdk path in Bazel embedded Android SDK repository. -- PiperOrigin-RevId: 147426838 MOS_MIGRATED_REVID=147426838
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 9791c9d..cab75e8 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
@@ -48,6 +48,11 @@ srcs = glob(["tools/lib64/**"]), ) +filegroup( + name = "sdk_path", + srcs = ["."], +) + create_android_device_rules( system_image_dirs = [ %system_image_dirs% ],
diff --git a/tools/android/emulator/BUILD.tools b/tools/android/emulator/BUILD.tools index f671a0b..f4a883c 100644 --- a/tools/android/emulator/BUILD.tools +++ b/tools/android/emulator/BUILD.tools
@@ -34,6 +34,11 @@ ], ) +alias( + name = "sdk_path", + actual = "@androidsdk//:sdk_path", +) + # Unified launcher is not included with Bazel or the Android SDK. Instead, it # comes from an external repository that must be set up in order for # android_device to work. @@ -45,4 +50,4 @@ filegroup( name = "shbase", srcs = ["googletest.sh"], -) \ No newline at end of file +)