Add "@androidsdk//:dexdump" alias and replace @androidsdk//:files Scanning @androidsdk//:files will trigger failures in bazelci because external/androidsdk/extras directory doesn't exist. PiperOrigin-RevId: 601450994 Change-Id: I2d1c90b71ad0af52b5e85793c09358154f35d42d
diff --git a/rules/android_sdk_repository/template.bzl b/rules/android_sdk_repository/template.bzl index 69df99e..db3f4f1 100644 --- a/rules/android_sdk_repository/template.bzl +++ b/rules/android_sdk_repository/template.bzl
@@ -42,6 +42,11 @@ ) alias( + name = "dexdump", + actual = "build-tools/%s/dexdump" % "__build_tools_directory__", +) + +alias( name = "emulator", actual = "emulator/emulator", )
diff --git a/test/rules/android_binary_internal/r8_integration/BUILD b/test/rules/android_binary_internal/r8_integration/BUILD index 997b6c4..e1a7c4f 100644 --- a/test/rules/android_binary_internal/r8_integration/BUILD +++ b/test/rules/android_binary_internal/r8_integration/BUILD
@@ -3,10 +3,11 @@ py_test( name = "r8_integration_test", srcs = ["r8_integration_test.py"], + args = ["$(location @androidsdk//:dexdump)"], data = [ "//test/rules/android_binary_internal/r8_integration/java/com/basicapp:basic_app_R8_no_shrink", "//test/rules/android_binary_internal/r8_integration/java/com/basicapp:basic_app_R8_shrink", "//test/rules/android_binary_internal/r8_integration/java/com/basicapp:basic_app_no_R8", - "@androidsdk//:files", + "@androidsdk//:dexdump", ], )
diff --git a/test/rules/android_binary_internal/r8_integration/r8_integration_test.py b/test/rules/android_binary_internal/r8_integration/r8_integration_test.py index 4947eda..750d71f 100755 --- a/test/rules/android_binary_internal/r8_integration/r8_integration_test.py +++ b/test/rules/android_binary_internal/r8_integration/r8_integration_test.py
@@ -14,6 +14,7 @@ import os import subprocess +import sys import unittest import zipfile @@ -39,12 +40,6 @@ "res/layout/unused_activity.xml" in apk_files, ) - build_tools_dir = "external/androidsdk/build-tools" - build_tools_version = [ - f.name for f in os.scandir(build_tools_dir) if f.is_dir() - ][0] - dexdump = os.path.join(build_tools_dir, build_tools_version, "dexdump") - dexdump_proc = subprocess.run( [dexdump, classes_dex], stdout=subprocess.PIPE, @@ -90,4 +85,5 @@ if __name__ == "__main__": - unittest.main() + dexdump = sys.argv.pop() + unittest.main(argv=None)