Use remap_paths to android_tools#17187
Closed
Bencodes wants to merge 2 commits intobazelbuild:masterfrom
Closed
Conversation
Contributor
Author
Contributor
|
Looks like there were a few presubmit errors. I peeked at the first one: |
Contributor
|
I cherry-picked this onto HEAD (at 11729dc) and it looks like someone else already added rules_pkg as a dist_http_archive dependency, yay! Let's import this. |
ted-xie
approved these changes
Jan 12, 2023
644c0fa to
155531e
Compare
Contributor
|
I force rebased this PR to HEAD, hopefully the presubmits will pass. Note to PR importer: Even if the buildkite presubmits fail, please import this, and I"ll resolve any remaining issues internally. |
Contributor
Author
Thanks for taking care of that! |
hvadehra
pushed a commit
that referenced
this pull request
Feb 14, 2023
This ensures that the `all_android_tools_deploy.jar` and `ImportDepsChecker_deploy.jar` artifacts end up in the root of the `tar` where `exports_files` is able to reference them. Before this PR the tar had the following directory structure: ``` ./ ./BUILD ./WORKSPACE ./desugar_jdk_libs.jar ./version.txt ./src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/ImportDepsChecker_deploy.jar ./src/tools/android/java/com/google/devtools/build/android/all_android_tools_deploy.jar ``` After: ``` BUILD ImportDepsChecker_deploy.jar WORKSPACE all_android_tools_deploy.jar desugar_jdk_libs.jar version.txt ``` Closes #17187. PiperOrigin-RevId: 501862387 Change-Id: Ida51fa3f0bd3b07d3106653e5292a90cac143b68
pswaminathan
pushed a commit
to pswaminathan/bazel
that referenced
this pull request
Jun 1, 2023
This ensures that the `all_android_tools_deploy.jar` and `ImportDepsChecker_deploy.jar` artifacts end up in the root of the `tar` where `exports_files` is able to reference them. Before this PR the tar had the following directory structure: ``` ./ ./BUILD ./WORKSPACE ./desugar_jdk_libs.jar ./version.txt ./src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/ImportDepsChecker_deploy.jar ./src/tools/android/java/com/google/devtools/build/android/all_android_tools_deploy.jar ``` After: ``` BUILD ImportDepsChecker_deploy.jar WORKSPACE all_android_tools_deploy.jar desugar_jdk_libs.jar version.txt ``` Closes bazelbuild#17187. PiperOrigin-RevId: 501862387 Change-Id: Ida51fa3f0bd3b07d3106653e5292a90cac143b68 (cherry picked from commit 773cfba)
ahumesky
pushed a commit
to ahumesky/bazel
that referenced
this pull request
Jul 6, 2023
This ensures that the `all_android_tools_deploy.jar` and `ImportDepsChecker_deploy.jar` artifacts end up in the root of the `tar` where `exports_files` is able to reference them. Before this PR the tar had the following directory structure: ``` ./ ./BUILD ./WORKSPACE ./desugar_jdk_libs.jar ./version.txt ./src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/ImportDepsChecker_deploy.jar ./src/tools/android/java/com/google/devtools/build/android/all_android_tools_deploy.jar ``` After: ``` BUILD ImportDepsChecker_deploy.jar WORKSPACE all_android_tools_deploy.jar desugar_jdk_libs.jar version.txt ``` Closes bazelbuild#17187. PiperOrigin-RevId: 501862387 Change-Id: Ida51fa3f0bd3b07d3106653e5292a90cac143b68
iancha1992
pushed a commit
that referenced
this pull request
Jul 7, 2023
…context … (#18853) * Teach DexMapper to not separate synthetic classes from their context classes when sharding dexes, like DexFileSplitter in 9092303. Fixes #16368 RELNOTES: None PiperOrigin-RevId: 546041575 Change-Id: I12fa8cff15b13534ca9a5682b7e9b43e6c860ef8 * Use remap_paths to android_tools This ensures that the `all_android_tools_deploy.jar` and `ImportDepsChecker_deploy.jar` artifacts end up in the root of the `tar` where `exports_files` is able to reference them. Before this PR the tar had the following directory structure: ``` ./ ./BUILD ./WORKSPACE ./desugar_jdk_libs.jar ./version.txt ./src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps/ImportDepsChecker_deploy.jar ./src/tools/android/java/com/google/devtools/build/android/all_android_tools_deploy.jar ``` After: ``` BUILD ImportDepsChecker_deploy.jar WORKSPACE all_android_tools_deploy.jar desugar_jdk_libs.jar version.txt ``` Closes #17187. PiperOrigin-RevId: 501862387 Change-Id: Ida51fa3f0bd3b07d3106653e5292a90cac143b68 * Add rules_pkg to the list of test repositories set up for shell integration tests. Commit b7a79ff depends on this. This is a partial cherrypick of e9929af. --------- Co-authored-by: Benjamin Lee <ben@ben.cm>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
This ensures that the
all_android_tools_deploy.jarandImportDepsChecker_deploy.jarartifacts end up in the root of thetarwhereexports_filesis able to reference them.Before this PR the tar had the following directory structure:
After: