From 79f29ea8cf7c34e656bee1a5c02433b77856c1b3 Mon Sep 17 00:00:00 2001
From: Jerome Gaillard <jgaillard@google.com>
Date: Wed, 17 Jul 2024 14:13:03 +0100
Subject: Use JVM-compatible libnativehelper for host builds

Flag: NONE host-only change
Bug: 322360037
Test: build libandroid_runtime on host
Change-Id: I1e8220af5e084518aedb85cd33b597d89443b62a
---
 core/jni/Android.bp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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",
-- 
cgit v1.2.3-59-g8ed1b