Skip to content

Commit 8fab22e

Browse files
tjgqcopybara-github
authored andcommitted
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 bazelbuild#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 bazelbuild#8235. PiperOrigin-RevId: 517180365 Change-Id: I2baa66af15af85349187e75e3acd4e3cb5d84a49
1 parent 1a5c316 commit 8fab22e

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

tools/android/android_sdk_repository_template.bzl

+1
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ def create_android_sdk_rules(
9090
"build-tools/%s/lib/d8.jar" % build_tools_directory,
9191
"build-tools/%s/lib/dx.jar" % build_tools_directory,
9292
"build-tools/%s/mainDexClasses.rules" % build_tools_directory,
93+
":build_tools_libs",
9394
] + [
9495
"platforms/android-%d/%s" % (api_level, filename)
9596
for api_level in api_levels

0 commit comments

Comments
 (0)