summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jerome Gaillard <jgaillard@google.com> 2024-07-17 14:13:03 +0100
committer John Wu <topjohnwu@google.com> 2024-09-26 22:59:57 +0000
commit2f5483472cfcde5f05af2fec864617b2bc5a00b0 (patch)
tree02058efe01297c0b042daaef92fc7043e36c9363
parent5e13e25d51685f4cf1ae4c9188ae19577538c6f7 (diff)
Use JVM-compatible libnativehelper for host builds
Flag: NONE host-only change Bug: 322360037 Test: build libandroid_runtime on host Merged-in: I1e8220af5e084518aedb85cd33b597d89443b62a Change-Id: I1e8220af5e084518aedb85cd33b597d89443b62a
-rw-r--r--core/jni/Android.bp3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp
index 387180600953..f6689d585df1 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -116,7 +116,6 @@ cc_library_shared_for_libandroid_runtime {
],
static_libs: [
- "libnativehelper_lazy",
"libziparchive_for_incfs",
"libguiflags",
],
@@ -290,6 +289,7 @@ cc_library_shared_for_libandroid_runtime {
"libdmabufinfo",
"libgui_window_info_static",
"libkernelconfigs",
+ "libnativehelper_lazy",
"libseccomp_policy",
"libgrallocusage",
"libscrypt_static",
@@ -419,6 +419,7 @@ cc_library_shared_for_libandroid_runtime {
"libimage_type_recognition",
"libinput",
"libjpeg",
+ "libnativehelper_jvm",
"libpiex",
"libpng",
"libtiff_directory",