From d34157addf7f6dba44b5b1ab13f3154c31f77930 Mon Sep 17 00:00:00 2001 From: Jingwen Chen Date: Thu, 9 May 2019 13:53:13 -0700 Subject: [PATCH] Configure @androidsdk//:emulator_x86 and :emulator_arm to point to the unified emulator binary Fixes #8280 Closes #8282. Change-Id: If21e2119b0c9baef245412b0e5a0bdcfe270892e PiperOrigin-RevId: 247489886 --- .../bazel/rules/android/android_sdk_repository_template.txt | 6 ++++-- 1 file changed, 4 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 c8861c9ec757f2..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 @@ -23,14 +23,16 @@ alias( actual = "emulator/emulator", ) +# emulator v29+ removed the arm and x86 specific binaries. +# Keeping these aliases around for backwards compatibility. alias( name = "emulator_arm", - actual = "emulator/emulator64-arm", + actual = "emulator/emulator", ) alias( name = "emulator_x86", - actual = "emulator/emulator64-x86", + actual = "emulator/emulator", ) filegroup(