Skip to content

Commit

Permalink
[6.2.0] Include build-tools/X.Y.Z/{lib,lib64}/** in the minimal set o…
Browse files Browse the repository at this point in the history
…f SDK files used by the Android integration tests. (bazelbuild#17826)

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
  • Loading branch information
tjgq authored Mar 20, 2023
1 parent eb6b343 commit fb695ed
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions tools/android/android_sdk_repository_template.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ def create_android_sdk_rules(
"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
Expand Down

0 comments on commit fb695ed

Please sign in to comment.