commit 50a454b23485ceb8fe37e102abc0e41e2857876a
author Ulya Trafimovich <skvadrik@google.com> Thu Jul 23 11:47:51 2020 +0100
committer Ulyana Trafimovich <skvadrik@google.com> Thu Jul 23 13:33:39 2020 +0000
tree 12699b0a7cd40e916c210bed4118a836491fea6d
parent aacf977a3b3af644a7e2eb58d8e56a23d1f3d215

Link statically with libart(d)-simulator-container.

Test: lunch aosp_cf_x86_phone-userdebug && m
Test: art/test.py --run-test --optimizing --host
Test: m test-art-host-gtest
Change-Id: I39d4b500d73a48e1a102a7c5826b6af384b8f031

build/apex/art_apex_test.py

diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 021fd5a..49677dd 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -546,8 +546,6 @@
     self._checker.check_native_library('libopenjdkjvmti')
     self._checker.check_native_library('libprofile')
     self._checker.check_native_library('libsigchain')
-    # Only on ARM/ARM64
-    self._checker.check_optional_native_library('libart-simulator-container')
 
     # Check java libraries for Managed Core Library.
     self._checker.check_java_library('apache-xml')
@@ -690,8 +688,6 @@
     self._checker.check_native_library('libopenjdkjvmd')
     self._checker.check_native_library('libopenjdkjvmtid')
     self._checker.check_native_library('libprofiled')
-    # Only on ARM/ARM64
-    self._checker.check_optional_native_library('libartd-simulator-container')
 
     # Check internal libraries for Managed Core Library.
     self._checker.check_native_library('libopenjdkd')

compiler/Android.bp

diff --git a/compiler/Android.bp b/compiler/Android.bp
index 513394e..ff7085c 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -452,10 +452,13 @@
         "libnativehelper_header_only",
     ],
 
+    static_libs: [
+        "libartd-simulator-container",
+    ],
+
     shared_libs: [
         "libprofiled",
         "libartd-compiler",
-        "libartd-simulator-container",
         "libvixld",
 
         "libbacktrace",

runtime/Android.bp

diff --git a/runtime/Android.bp b/runtime/Android.bp
index fbeb269..1eeac26 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -559,10 +559,10 @@
     ],
     static_libs: [
         "libelffile",
+        "libart-simulator-container",
     ],
     shared_libs: [
         "libartbase",
-        "libart-simulator-container",
         "libdexfile",
         // We need to eagerly load it so libdexfile_support used from libunwindstack can find it.
         "libdexfile_external",
@@ -594,10 +594,10 @@
     ],
     static_libs: [
         "libelffiled",
+        "libartd-simulator-container",
     ],
     shared_libs: [
         "libartbased",
-        "libartd-simulator-container",
         "libdexfiled",
         // We need to eagerly preload it, so that libunwindstack can find it.
         // Otherwise, it would try to load the non-debug version with dlopen.