commit c2f8b5086545b6ddb7bacb30f78539f7582696ea
author Martin Stjernholm <mast@google.com> Thu Jan 17 14:51:35 2019 +0000
committer Martin Stjernholm <mast@google.com> Thu Feb 07 15:23:37 2019 +0000
tree 66b983951f572fa9075c4ea86572ae0ee976294d
parent 8e1ca6103de597cec698b2337d19a94d17ae8338

Add remaining libnative* libs to the Runtime APEX.

Test: Flash and boot
Test: atest CtsJniTestCases
Test: Boot test on internal tree
Bug: 113373927
Change-Id: I95273ee11c9c0d93fbd1aea4494f6f705dfb44c7

build/apex/Android.bp

diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index e3e5b6e..2467280 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -13,11 +13,14 @@
 ]
 // - Base requirements (libraries).
 art_runtime_base_native_shared_libs = [
+    "libadbconnection",
     "libart",
     "libart-compiler",
+    "libnativebridge",
+    "libnativehelper",
+    "libnativeloader",
     "libopenjdkjvm",
     "libopenjdkjvmti",
-    "libadbconnection",
 ]
 bionic_native_shared_libs = [
     "libc",
@@ -41,11 +44,11 @@
 
 // - Debug variants (libraries).
 art_runtime_debug_native_shared_libs = [
+    "libadbconnectiond",
     "libartd",
     "libartd-compiler",
     "libopenjdkjvmd",
     "libopenjdkjvmtid",
-    "libadbconnectiond",
 ]
 libcore_debug_native_shared_libs = [
     "libopenjdkd",