Skip to content

Commit b7a79ff

Browse files
Bencodesahumesky
authored andcommitted
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 bazelbuild#17187. PiperOrigin-RevId: 501862387 Change-Id: Ida51fa3f0bd3b07d3106653e5292a90cac143b68
1 parent ebff138 commit b7a79ff

File tree

3 files changed

+15
-1
lines changed

3 files changed

+15
-1
lines changed

src/test/shell/BUILD

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ gen_workspace_stanza(
2929
"rules_cc",
3030
"rules_java",
3131
"rules_license",
32+
"rules_pkg",
3233
"rules_proto",
3334
],
3435
template = "testenv.sh.tmpl",

src/test/shell/testenv.sh.tmpl

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -554,6 +554,14 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
554554
EOF
555555
}
556556

557+
function add_rules_pkg_to_workspace() {
558+
cat >> "$1"<<EOF
559+
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
560+
561+
{rules_pkg}
562+
EOF
563+
}
564+
557565
function add_rules_proto_to_workspace() {
558566
cat >> "$1"<<EOF
559567
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
@@ -575,6 +583,7 @@ EOF
575583
add_rules_cc_to_workspace "WORKSPACE"
576584
add_rules_java_to_workspace "WORKSPACE"
577585
add_rules_license_to_workspace "WORKSPACE"
586+
add_rules_pkg_to_workspace "WORKSPACE"
578587
add_rules_proto_to_workspace "WORKSPACE"
579588

580589
maybe_setup_python_windows_workspace

tools/android/runtime_deps/BUILD.bazel

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# extract all Android rules and tools out of Bazel and into rules_android
55
# and tools_android.
66

7-
load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
7+
load("@rules_pkg//pkg:tar.bzl", "pkg_tar")
88

99
filegroup(
1010
name = "srcs",
@@ -84,5 +84,9 @@ pkg_tar(
8484
"//src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker_deploy.jar",
8585
"//src/tools/android/java/com/google/devtools/build/android:all_android_tools_deploy.jar",
8686
],
87+
remap_paths = {
88+
"src/java_tools/import_deps_checker/java/com/google/devtools/build/importdeps:ImportDepsChecker_deploy.jar": "ImportDepsChecker_deploy.jar",
89+
"src/tools/android/java/com/google/devtools/build/android:all_android_tools_deploy.jar": "all_android_tools_deploy.jar",
90+
},
8791
visibility = ["//src/test/shell/bazel:__subpackages__"],
8892
)

0 commit comments

Comments
 (0)