summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compiler/Android.bp2
-rw-r--r--dex2oat/Android.bp12
-rw-r--r--dexlayout/Android.bp2
-rw-r--r--imgdiag/Android.bp3
-rw-r--r--libartbase/Android.bp31
-rw-r--r--libdexfile/Android.bp14
-rw-r--r--libprofile/Android.bp19
-rw-r--r--runtime/Android.bp10
-rw-r--r--test/Android.bp10
-rw-r--r--tools/veridex/Android.bp2
10 files changed, 87 insertions, 18 deletions
diff --git a/compiler/Android.bp b/compiler/Android.bp
index 8e4e383b92..c2f8e3c66e 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -180,6 +180,7 @@ art_cc_defaults {
shared_libs: [
"libbase",
"libcutils", // for atrace.
+ "liblzma",
],
include_dirs: ["art/disassembler"],
header_libs: [
@@ -195,6 +196,7 @@ cc_defaults {
static_libs: [
"libbase",
"libcutils",
+ "liblzma",
],
}
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 2f8275ef89..666db425bd 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -71,6 +71,8 @@ art_cc_defaults {
generated_sources: ["art_dex2oat_operator_srcs"],
shared_libs: [
"libbase",
+ "liblz4",
+ "liblzma",
],
include_dirs: [
"external/lz4/lib",
@@ -96,6 +98,8 @@ cc_defaults {
},
static_libs: [
"libbase",
+ "liblz4",
+ "liblzma",
],
}
@@ -243,6 +247,7 @@ art_cc_binary {
"libdexfile",
"libartbase",
"libbase",
+ "liblz4",
"libsigchain",
],
static_libs: [
@@ -280,6 +285,7 @@ art_cc_binary {
"libdexfiled",
"libartbased",
"libbase",
+ "liblz4",
"libsigchain",
],
static_libs: [
@@ -309,6 +315,7 @@ cc_defaults {
],
static_libs: [
"libbase",
+ "liblz4",
"libsigchain_dummy",
],
}
@@ -404,12 +411,13 @@ art_cc_test {
"external/zlib",
],
shared_libs: [
- "libartbased",
+ "libprofiled",
"libartd-compiler",
"libartd-dexlayout",
"libbase",
- "libprofiled",
+ "liblz4",
"libsigchain",
+ "libziparchive",
],
static_libs: [
"libartd-dex2oat",
diff --git a/dexlayout/Android.bp b/dexlayout/Android.bp
index 06e949c9c6..24ee5f8532 100644
--- a/dexlayout/Android.bp
+++ b/dexlayout/Android.bp
@@ -29,12 +29,14 @@ art_cc_defaults {
shared_libs: [
"libbase",
],
+ static_libs: ["libz"],
}
cc_defaults {
name: "libart-dexlayout_static_base_defaults",
static_libs: [
"libbase",
+ "libz",
],
}
diff --git a/imgdiag/Android.bp b/imgdiag/Android.bp
index 51add1aba8..972c8f7189 100644
--- a/imgdiag/Android.bp
+++ b/imgdiag/Android.bp
@@ -34,6 +34,9 @@ cc_defaults {
android: {
shared_libs: ["libcutils"],
},
+ host: {
+ shared_libs: ["libziparchive"],
+ },
},
header_libs: [
"art_cmdlineparser_headers",
diff --git a/libartbase/Android.bp b/libartbase/Android.bp
index 44b75e6ae6..0c6b1a2ef6 100644
--- a/libartbase/Android.bp
+++ b/libartbase/Android.bp
@@ -49,15 +49,20 @@ cc_defaults {
],
target: {
android: {
+ static_libs: [
+ // ZipArchive support, the order matters here to get all symbols.
+ "libziparchive",
+ "libz",
+ ],
shared_libs: [
// For android::FileMap used by libziparchive.
"libutils",
],
},
host: {
- static_libs: [
- // For android::FileMap used by libziparchive.
- "libutils",
+ shared_libs: [
+ "libziparchive",
+ "libz",
],
},
},
@@ -70,18 +75,6 @@ cc_defaults {
// For common macros.
"libbase",
],
-
- // Utilities used by various ART libs and tools are linked in statically
- // here to avoid shared lib dependencies outside the ART APEX. No target
- // there should depend on these separately.
- whole_static_libs: [
- "liblz4",
- "liblzma",
- // ZipArchive support, the order matters here to get all symbols.
- "libziparchive",
- "libz",
- ],
-
export_include_dirs: ["."],
// ART's macros.h depends on libbase's macros.h.
// Note: runtime_options.h depends on cmdline. But we don't really want to export this
@@ -96,6 +89,8 @@ cc_defaults {
"libcutils",
"liblog",
"libutils",
+ "libz",
+ "libziparchive",
],
}
@@ -134,6 +129,7 @@ art_cc_library {
},
shared_libs: [
"libbase",
+ "libziparchive",
],
export_shared_lib_headers: ["libbase"],
}
@@ -144,6 +140,11 @@ art_cc_library {
"art_debug_defaults",
"libartbase_defaults",
],
+ shared_libs: [
+ "libbase",
+ "libziparchive",
+ ],
+ export_shared_lib_headers: ["libbase"],
}
art_cc_library {
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index d7399b3b77..49b1278fcb 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -39,10 +39,20 @@ cc_defaults {
target: {
android: {
+ static_libs: [
+ "libziparchive",
+ "libz",
+ ],
shared_libs: [
"libutils",
],
},
+ host: {
+ shared_libs: [
+ "libziparchive",
+ "libz",
+ ],
+ },
},
generated_sources: ["dexfile_operator_srcs"],
shared_libs: [
@@ -53,6 +63,7 @@ cc_defaults {
"libcutils",
// For common macros.
"libbase",
+ "libz",
],
export_include_dirs: ["."],
export_shared_lib_headers: [
@@ -68,6 +79,8 @@ cc_defaults {
"libcutils",
"liblog",
"libutils",
+ "libz",
+ "libziparchive",
],
}
@@ -145,6 +158,7 @@ art_cc_test {
],
shared_libs: [
"libbacktrace",
+ "libziparchive",
],
include_dirs: [
"external/zlib",
diff --git a/libprofile/Android.bp b/libprofile/Android.bp
index 0f8db9c281..edd9fa858b 100644
--- a/libprofile/Android.bp
+++ b/libprofile/Android.bp
@@ -23,17 +23,27 @@ cc_defaults {
],
target: {
android: {
+ static_libs: [
+ // ZipArchive support, the order matters here to get all symbols.
+ "libziparchive",
+ "libz",
+ ],
shared_libs: [
// For android::FileMap used by libziparchive.
"libutils",
],
},
+ host: {
+ shared_libs: [
+ "libziparchive",
+ "libz",
+ ],
+ },
},
//generated_sources: ["art_libartbase_operator_srcs"],
cflags: ["-DBUILDING_LIBART=1"],
shared_libs: [
"libartbase",
- "libbase",
"libdexfile",
"libartbase",
// For atrace.
@@ -52,6 +62,8 @@ cc_defaults {
"libbase",
"libcutils",
"libutils",
+ "libz",
+ "libziparchive",
],
}
@@ -85,7 +97,9 @@ art_cc_library {
},
shared_libs: [
"libbase",
+ "libziparchive",
],
+ export_shared_lib_headers: ["libbase"],
}
art_cc_library {
@@ -96,7 +110,9 @@ art_cc_library {
],
shared_libs: [
"libbase",
+ "libziparchive",
],
+ export_shared_lib_headers: ["libbase"],
}
// For now many of these tests still use CommonRuntimeTest, almost universally because of
@@ -114,5 +130,6 @@ art_cc_test {
"libartbased",
"libdexfiled",
"libartbased",
+ "libziparchive",
],
}
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 54027369d8..86ee952022 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -341,6 +341,9 @@ libart_cc_defaults {
shared_libs: [
"libtombstoned_client",
],
+ static_libs: [
+ "libz", // For adler32.
+ ],
},
android_arm: {
ldflags: JIT_DEBUG_REGISTER_CODE_LDFLAGS,
@@ -360,6 +363,9 @@ libart_cc_defaults {
"runtime_linux.cc",
"thread_linux.cc",
],
+ shared_libs: [
+ "libz", // For adler32.
+ ],
},
},
cflags: ["-DBUILDING_LIBART=1"],
@@ -384,6 +390,7 @@ libart_cc_defaults {
"libnativebridge",
"libnativeloader",
"libbacktrace",
+ "liblz4",
"liblog",
// For atrace, properties, ashmem, set_sched_policy.
"libcutils",
@@ -415,9 +422,12 @@ libart_static_cc_defaults {
"libbase",
"libcutils",
"liblog",
+ "liblz4",
+ "liblzma",
"libnativebridge",
"libnativeloader",
"libunwindstack",
+ "libz",
],
}
diff --git a/test/Android.bp b/test/Android.bp
index b729b0ddd1..561f95eb47 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -70,6 +70,7 @@ art_cc_defaults {
"libicuuc",
"libicui18n",
"libnativehelper",
+ "libz",
],
whole_static_libs: [
"libsigchain",
@@ -92,6 +93,11 @@ art_cc_defaults {
"-Wno-missing-noreturn",
],
},
+ host: {
+ shared_libs: [
+ "libziparchive",
+ ],
+ },
android: {
shared_libs: [
"liblog",
@@ -319,6 +325,7 @@ art_cc_defaults {
// "1952-pop-frame-jit/pop_frame.cc",
],
static_libs: [
+ "libz",
"slicer",
],
}
@@ -361,6 +368,9 @@ cc_library_static {
static_libs: [
"libbase_ndk",
],
+ shared_libs: [
+ "libz", // for slicer (using adler32).
+ ],
sdk_version: "current",
stl: "c++_static",
include_dirs: [
diff --git a/tools/veridex/Android.bp b/tools/veridex/Android.bp
index f0d83a8ef2..92ace035cf 100644
--- a/tools/veridex/Android.bp
+++ b/tools/veridex/Android.bp
@@ -31,6 +31,8 @@ cc_binary {
"libbase",
"liblog",
"libutils",
+ "libz",
+ "libziparchive",
],
stl: "libc++_static",
header_libs: [
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-12-09 09:29:12 +0000