summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jerome Gaillard <jgaillard@google.com> 2024-07-17 14:13:03 +0100
committer Jerome Gaillard <jgaillard@google.com> 2024-07-17 13:18:17 +0000
commit79f29ea8cf7c34e656bee1a5c02433b77856c1b3 (patch)
treeb19aec4b0c46352ee36f2d80492cfce5cc91d72f
parentb564eb418de49db3f480f31e278fb3ac077a7f72 (diff)
Use JVM-compatible libnativehelper for host builds
Flag: NONE host-only change Bug: 322360037 Test: build libandroid_runtime on host 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 011ef30c7466..ca984c03b174 100644
--- a/core/jni/Android.bp
+++ b/core/jni/Android.bp
@@ -117,7 +117,6 @@ cc_library_shared_for_libandroid_runtime {
],
static_libs: [
- "libnativehelper_lazy",
"libziparchive_for_incfs",
"libguiflags",
],
@@ -292,6 +291,7 @@ cc_library_shared_for_libandroid_runtime {
"libgif",
"libgui_window_info_static",
"libkernelconfigs",
+ "libnativehelper_lazy",
"libseccomp_policy",
"libgrallocusage",
"libscrypt_static",
@@ -421,6 +421,7 @@ cc_library_shared_for_libandroid_runtime {
"libimage_type_recognition",
"libinput",
"libjpeg",
+ "libnativehelper_jvm",
"libpiex",
"libpng",
"libtiff_directory",