Android SDK declares toolchains that should be registered. #11737
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
juliexxia
approved these changes
Jul 9, 2020
katre
force-pushed
the
android-sdk-registers-toolchains
branch
2 times, most recently
from
3e8c9df to
8867c91
Compare
bazel-io
pushed a commit
that referenced
this pull request
Jul 20, 2020
Currently, the android_sdk_repository and android_ndk_repository in the WORKSPACE are commented out by default, but the CI workers uncomment them before starting execution. Currently this isn't a problem. However, once #11737 is submitted, bazel_boostrap_distfile_test and bazel_determinism_test will begin to fail, because the uncommented android_sdk_repository will execute, then fail because either ANDROID_HOME is not set or points to an invalid directory. Since the bootstrap process should never execute Android rules, I decided it would be clearer to remove the possibility entirely by removing the repo declarations from the WORKSPACE. The cleanups to the tools/android are more for clarity, to ensure they match the actual @bazel_tools used by built bazel. In an ideal world we'd remove much more code from the distfile and this wouldn't be present at all. Three changes: 1. Use tools/android/BUILD.tools instead of tools/android/BUILD in the distfile. 2. Re-comment android_sdk_repository and android_ndk_repository (they aren't needed for bootstrapping). 3. Fix srcs_test to handle the case where part of the distfile is generated by a genrule. Closes #11744. PiperOrigin-RevId: 322143408
katre
force-pushed
the
android-sdk-registers-toolchains
branch
from
8867c91 to
95042e6
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.