commit 8fab22e64035561fdb1c96d4e507b78a02cb5e39
author Googler <tjgq@google.com> Thu Mar 16 11:33:29 2023 -0700
committer Copybara-Service <copybara-worker@google.com> Thu Mar 16 11:34:46 2023 -0700
tree 539995cbffb64a1c079f34bb1c3f6d5bbcbc4ffa
parent 1a5c3160d7a683c80c778278b75b2a7cde11996b

Include build-tools/X.Y.Z/{lib,lib64}/** in the minimal set of SDK files used by the Android integration tests.

This is necessary to reenable remote caching/execution for these tests (and make CI runs faster!). In the absence of this change, the tests will fail because the aapt/appt2/aidl/zipalign tools can't be dynamically linked in the remote environment. See issue #8235.

We need to wait until this change makes it into a Bazel release before reenabling the tests, as they inherit the SDK files from the Bazel that runs them.

Related to #8235.

PiperOrigin-RevId: 517180365
Change-Id: I2baa66af15af85349187e75e3acd4e3cb5d84a49

tools/android/android_sdk_repository_template.bzl

diff --git a/tools/android/android_sdk_repository_template.bzl b/tools/android/android_sdk_repository_template.bzl
index 2533923..1453a18 100644
--- a/tools/android/android_sdk_repository_template.bzl
+++ b/tools/android/android_sdk_repository_template.bzl
@@ -90,6 +90,7 @@
             "build-tools/%s/lib/d8.jar" % build_tools_directory,
             "build-tools/%s/lib/dx.jar" % build_tools_directory,
             "build-tools/%s/mainDexClasses.rules" % build_tools_directory,
+            ":build_tools_libs",
         ] + [
             "platforms/android-%d/%s" % (api_level, filename)
             for api_level in api_levels