ANDROID: kythe targets use pkg_install.
We are deprecating copy_to_dist_dir and switching to the upstreamed pkg_install() rule. Bug: 331730853 Change-Id: I850084ff1d76fb3cc0c9ba6017d5ed05d04bfeed Signed-off-by: HONG Yifan <elsk@google.com>
This commit is contained in:
committed by
Matthias Männich
parent
4c56ebdd90
commit
52ba39106b
+33
-17
@@ -5,11 +5,7 @@ load("@bazel_skylib//lib:paths.bzl", "paths")
|
||||
load("@bazel_skylib//rules:common_settings.bzl", "string_flag")
|
||||
load("@bazel_skylib//rules:write_file.bzl", "write_file")
|
||||
load("@rules_pkg//pkg:install.bzl", "pkg_install")
|
||||
load(
|
||||
"@rules_pkg//pkg:mappings.bzl",
|
||||
"pkg_filegroup",
|
||||
"pkg_files",
|
||||
)
|
||||
load("@rules_pkg//pkg:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
|
||||
load("@rules_pkg//pkg:pkg.bzl", "pkg_zip")
|
||||
load("//build/bazel_common_rules/dist:dist.bzl", "copy_to_dist_dir")
|
||||
load(
|
||||
@@ -319,12 +315,18 @@ kernel_kythe(
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
copy_to_dist_dir(
|
||||
name = "kernel_aarch64_kythe_dist",
|
||||
data = [
|
||||
pkg_files(
|
||||
name = "kernel_aarch64_kythe_files",
|
||||
srcs = [
|
||||
":kernel_aarch64_kythe",
|
||||
],
|
||||
flat = True,
|
||||
strip_prefix = strip_prefix.files_only(),
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
pkg_install(
|
||||
name = "kernel_aarch64_kythe_dist",
|
||||
srcs = [":kernel_aarch64_kythe_files"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
@@ -335,12 +337,18 @@ kernel_kythe(
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
copy_to_dist_dir(
|
||||
name = "kernel_x86_64_kythe_dist",
|
||||
data = [
|
||||
":kernel_x86_64_kythe",
|
||||
pkg_files(
|
||||
name = "kernel_x86_64_kythe_files",
|
||||
srcs = [
|
||||
":kernel_aarch64_kythe",
|
||||
],
|
||||
flat = True,
|
||||
strip_prefix = strip_prefix.files_only(),
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
pkg_install(
|
||||
name = "kernel_x86_64_kythe_dist",
|
||||
srcs = [":kernel_x86_64_kythe_files"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
@@ -353,10 +361,18 @@ merge_kzip(
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
copy_to_dist_dir(
|
||||
pkg_files(
|
||||
name = "kernel_kythe_files",
|
||||
srcs = [
|
||||
":kernel_kythe",
|
||||
],
|
||||
strip_prefix = strip_prefix.files_only(),
|
||||
visibility = ["//visibility:private"],
|
||||
)
|
||||
|
||||
pkg_install(
|
||||
name = "kernel_kythe_dist",
|
||||
data = [":kernel_kythe"],
|
||||
flat = True,
|
||||
srcs = [":kernel_kythe_files"],
|
||||
visibility = ["//visibility:public"],
|
||||
)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user