summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Android.bp5
-rw-r--r--adbconnection/Android.bp4
-rw-r--r--build/Android.bp7
-rw-r--r--dex2oat/Android.bp8
-rw-r--r--libartbase/Android.bp9
-rw-r--r--libartimagevalues/Android.bp4
-rw-r--r--libartpalette/Android.bp5
-rw-r--r--libdexfile/Android.bp17
-rw-r--r--openjdkjvm/Android.bp1
-rw-r--r--openjdkjvmti/Android.bp1
-rw-r--r--sigchainlib/Android.bp14
-rw-r--r--test/Android.bp9
-rw-r--r--tools/ahat/Android.bp3
13 files changed, 86 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
new file mode 100644
index 0000000000..818fcfb45e
--- /dev/null
+++ b/Android.bp
@@ -0,0 +1,5 @@
+// If you're looking for ART global stuff, please see build/Android.bp.
+
+package {
+ default_visibility: ["//art:__subpackages__"],
+}
diff --git a/adbconnection/Android.bp b/adbconnection/Android.bp
index fbc8afe1d0..da73619f00 100644
--- a/adbconnection/Android.bp
+++ b/adbconnection/Android.bp
@@ -57,6 +57,10 @@ art_cc_library {
cc_library {
name: "libadbconnection_server",
+ visibility: [
+ // TODO(b/133140750): Clean this up.
+ "//system/core/adb",
+ ],
srcs: ["adbconnection_server.cc"],
export_include_dirs: ["include"],
shared_libs: ["libbase"],
diff --git a/build/Android.bp b/build/Android.bp
index 605d4681f7..45564f413e 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -58,6 +58,12 @@ art_global_defaults {
// Additional flags are computed by art.go
name: "art_defaults",
+
+ // This is the default visibility for the //art package, but we repeat it
+ // here so that it gets merged with other visibility rules in modules
+ // extending these defaults.
+ visibility: ["//art:__subpackages__"],
+
cflags: [
// Base set of cflags used by all things ART.
"-fno-rtti",
@@ -221,6 +227,7 @@ art_global_defaults {
art_debug_defaults {
name: "art_debug_defaults",
+ visibility: ["//art:__subpackages__"],
cflags: [
"-DDYNAMIC_ANNOTATIONS_ENABLED=1",
"-DVIXL_DEBUG",
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index cb59bc2359..14bca00c9e 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -165,6 +165,10 @@ cc_defaults {
cc_library_headers {
name: "dex2oat_headers",
+ visibility: [
+ // TODO(b/133140750): Clean this up.
+ "//frameworks/native/cmds/installd",
+ ],
host_supported: true,
export_include_dirs: ["include"],
}
@@ -192,6 +196,10 @@ cc_defaults {
cc_defaults {
name: "dex2oat-pgo-defaults",
+ defaults_visibility: [
+ "//art:__subpackages__",
+ "//external/vixl",
+ ],
pgo: {
instrumentation: true,
benchmarks: ["dex2oat"],
diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index 4fb0f761ed..cb0721bb71 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -166,6 +166,15 @@ gensrcs {
art_cc_library {
name: "libartbase",
defaults: ["libartbase_defaults"],
+ visibility: [
+ // TODO(b/133140750): Clean this up.
+ "//cts/tests/tests/appop",
+ "//frameworks/base/startop/view_compiler",
+ "//frameworks/base/tests/net:__subpackages__",
+ "//packages/modules/NetworkStack/tests:__subpackages__",
+ "//system/extras/simpleperf",
+ ],
+
// Leave the symbols in the shared library so that stack unwinders can
// produce meaningful name resolution.
strip: {
diff --git a/libartimagevalues/Android.bp b/libartimagevalues/Android.bp
index c47dd722f9..80f58b7189 100644
--- a/libartimagevalues/Android.bp
+++ b/libartimagevalues/Android.bp
@@ -6,6 +6,10 @@ art_global_defaults {
cc_library_static {
name: "libartimagevalues",
defaults: ["libartimagevalues_defaults"],
+ visibility: [
+ // TODO(b/133140750): Clean this up.
+ "//frameworks/native/cmds/installd",
+ ],
srcs: ["art_image_values.cpp"],
export_include_dirs: ["."],
cflags: ["-Wconversion"],
diff --git a/libartpalette/Android.bp b/libartpalette/Android.bp
index 0a45b8880b..f6c7ac168a 100644
--- a/libartpalette/Android.bp
+++ b/libartpalette/Android.bp
@@ -63,6 +63,11 @@ art_cc_library {
art_cc_library {
name: "libartpalette",
defaults: ["libartpalette_defaults"],
+ visibility: [
+ // TODO(b/133140750): Clean this up.
+ "//frameworks/base/startop/view_compiler",
+ "//system/extras/simpleperf",
+ ],
required: ["libartpalette-system"], // libartpalette.so dlopen()'s libartpalette-system.
header_libs: ["libbase_headers"],
target: {
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index c740f7b837..d4aead05c8 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -108,6 +108,12 @@ cc_defaults {
"libartbase_static_defaults",
"libdexfile_static_base_defaults",
],
+ defaults_visibility: [
+ "//art:__subpackages__",
+ // TODO(b/133140750): Clean this up.
+ "//frameworks/base/startop/view_compiler",
+ "//system/extras/simpleperf",
+ ],
static_libs: ["libdexfile"],
}
@@ -138,6 +144,13 @@ gensrcs {
art_cc_library {
name: "libdexfile",
defaults: ["libdexfile_defaults"],
+ visibility: [
+ // TODO(b/133140750): Clean this up.
+ "//cts/tests/tests/appop",
+ "//frameworks/base/startop/view_compiler",
+ "//frameworks/base/tests/net:__subpackages__",
+ "//system/extras/simpleperf",
+ ],
// Leave the symbols in the shared library so that stack unwinders can
// produce meaningful name resolution.
strip: {
@@ -242,6 +255,7 @@ art_cc_test {
cc_library_headers {
name: "libdexfile_external_headers",
+ visibility: ["//visibility:public"],
host_supported: true,
vendor_available: true,
recovery_available: true,
@@ -287,6 +301,7 @@ cc_library {
"art_defaults",
"libdexfile_external-defaults",
],
+ visibility: ["//visibility:public"],
target: {
darwin: {
enabled: true,
@@ -332,6 +347,7 @@ art_cc_test {
// stack frames.
cc_library {
name: "libdexfile_support",
+ visibility: ["//visibility:public"],
host_supported: true,
vendor_available: true,
recovery_available: true,
@@ -374,6 +390,7 @@ art_cc_test {
cc_library_static {
name: "libdexfile_support_static",
+ visibility: ["//visibility:public"],
host_supported: true,
defaults: ["libdexfile_static_defaults"],
srcs: [
diff --git a/openjdkjvm/Android.bp b/openjdkjvm/Android.bp
index 907315e4e0..a5350f98e5 100644
--- a/openjdkjvm/Android.bp
+++ b/openjdkjvm/Android.bp
@@ -16,6 +16,7 @@
cc_defaults {
name: "libopenjdkjvm_defaults",
defaults: ["art_defaults"],
+ visibility: ["//libcore"],
host_supported: true,
srcs: ["OpenjdkJvm.cc"],
shared_libs: [
diff --git a/openjdkjvmti/Android.bp b/openjdkjvmti/Android.bp
index 7621d48f6e..e7306ba095 100644
--- a/openjdkjvmti/Android.bp
+++ b/openjdkjvmti/Android.bp
@@ -15,6 +15,7 @@
cc_library_headers {
name: "libopenjdkjvmti_headers",
+ visibility: ["//visibility:public"],
host_supported: true,
export_include_dirs: ["include"],
sdk_version: "current",
diff --git a/sigchainlib/Android.bp b/sigchainlib/Android.bp
index 31a8f3dfbc..a94daf3814 100644
--- a/sigchainlib/Android.bp
+++ b/sigchainlib/Android.bp
@@ -16,9 +16,13 @@
cc_library {
name: "libsigchain",
+ defaults: ["art_defaults"],
+ visibility: [
+ // TODO(b/133140750): Clean this up.
+ "//frameworks/base/cmds/app_process",
+ ],
host_supported: true,
- defaults: ["art_defaults"],
target: {
linux: {
shared: {
@@ -69,10 +73,18 @@ art_cc_test {
filegroup {
name: "art_sigchain_version_script32.txt",
+ visibility: [
+ // TODO(b/133140750): Clean this up.
+ "//frameworks/base/cmds/app_process",
+ ],
srcs: ["version-script32.txt"],
}
filegroup {
name: "art_sigchain_version_script64.txt",
+ visibility: [
+ // TODO(b/133140750): Clean this up.
+ "//frameworks/base/cmds/app_process",
+ ],
srcs: ["version-script64.txt"],
}
diff --git a/test/Android.bp b/test/Android.bp
index 86d185799a..66a08e92d0 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -372,6 +372,9 @@ art_cc_test_library {
cc_library_static {
name: "libctstiagent",
defaults: ["libtiagent-base-defaults"],
+ visibility: [
+ "//cts/hostsidetests/jvmti:__subpackages__",
+ ],
host_supported: false,
srcs: [
"983-source-transform-verify/source_transform_slicer.cc",
@@ -579,6 +582,9 @@ art_cc_test_library {
filegroup {
name: "art_cts_jvmti_test_library",
+ visibility: [
+ "//cts/hostsidetests/jvmti:__subpackages__",
+ ],
srcs: [
// shim classes. We use one that exposes the common functionality.
"jvmti-common/Redefinition.java",
@@ -710,6 +716,9 @@ filegroup {
// Copy+rename them them to a temporary directory and them zip them.
java_genrule {
name: "expected_cts_outputs",
+ visibility: [
+ "//cts/hostsidetests/jvmti:__subpackages__",
+ ],
srcs: [
"901-hello-ti-agent/expected.txt",
"902-hello-transformation/expected.txt",
diff --git a/tools/ahat/Android.bp b/tools/ahat/Android.bp
index 3b75dd27ff..a08a03dc1e 100644
--- a/tools/ahat/Android.bp
+++ b/tools/ahat/Android.bp
@@ -33,6 +33,9 @@ droiddoc_host {
// --- ahat.jar ----------------
java_binary_host {
name: "ahat",
+ visibility: [
+ "//libcore/metrictests/memory/host",
+ ],
wrapper: "ahat",
srcs: ["src/main/**/*.java"],
manifest: "etc/ahat.mf",
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2026-01-07 17:36:57 +0000