Skip to content

Commit

Permalink
Include build-tools/X.Y.Z/{lib,lib64}/** in the minimal set of SDK fi…
Browse files Browse the repository at this point in the history
…les 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
  • Loading branch information
tjgq authored and Copybara-Service committed Mar 16, 2023
1 parent 1a5c316 commit 8fab22e
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

2 comments on commit 8fab22e

@tjgq
Copy link
Contributor Author

@tjgq tjgq commented on 8fab22e Mar 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bazel-io fork 6.2.0

@tjgq
Copy link
Contributor Author

@tjgq tjgq commented on 8fab22e Mar 20, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bazel-io fork 6.2.0

Cherry-picking in #17826.

Please sign in to comment.