commit f7f315253bbe204c5e69608b7010438924623d77
author Alex Light <allight@google.com> Fri Feb 01 11:14:41 2019 -0800
committer Alex Light <allight@google.com> Wed Feb 06 09:28:04 2019 -0800
tree c70054a8b74734d8622f59f26ce0e95100253c14
parent 5fe64d84822bf86d72d941c271c93ecbb0ff0742

Update zipapex tests to run fully out of the zipapex

The zipapex tests could access non-test libraries not included in the
zipapex. This caused us to miss the fact that several important
libraries were missing from the zipapex. This changes the test script
to prevent this issue and adds several missing dependencies to the
com.android.runtime.host zipapex.

Test: ./art/test/testrunner/run_build_test_target.py -j72 art-linux-bionic-x64-zipapex
Bug: 123591866
Change-Id: Ie4858bafb5446ebbb62782191b05bab2a8369853

build/apex/Android.bp

diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 47a1e4b..10bb421 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -104,6 +104,14 @@
     "apache-xml",
 ]
 
+// Temporary library includes for b/123591866 as all libraries are moved into the main art-apex.
+art_runtime_libraries_zipapex = [
+    "libnativebridge",
+    "libnativeloader",
+    "libnativehelper",
+    "libcutils",
+]
+
 apex_key {
     name: "com.android.runtime.key",
     public_key: "com.android.runtime.avbpubkey",
@@ -192,6 +200,7 @@
 art_apex {
     name: "com.android.runtime.host",
     compile_multilib: "both",
+    installable: false,
     payload_type: "zip",
     host_supported: true,
     device_supported: false,
@@ -201,7 +210,8 @@
     native_shared_libs: art_runtime_base_native_shared_libs
         + art_runtime_debug_native_shared_libs
         + libcore_native_shared_libs
-        + libcore_debug_native_shared_libs,
+        + libcore_debug_native_shared_libs
+        + art_runtime_libraries_zipapex,
     multilib: {
         both: {
             // TODO: Add logic to create a `dalvikvm` symlink to `dalvikvm32` or `dalvikvm64`

test/etc/run-test-jar

diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar
index 660c971..2910920 100755
--- a/test/etc/run-test-jar
+++ b/test/etc/run-test-jar
@@ -1005,12 +1005,14 @@
     export ANDROID_DATA="$DEX_LOCATION"
     export ANDROID_ROOT="${ANDROID_ROOT}"
     export ANDROID_RUNTIME_ROOT="${ANDROID_RUNTIME_ROOT}"
-    export LD_LIBRARY_PATH="${ANDROID_ROOT}/${LIBRARY_DIRECTORY}:${ANDROID_ROOT}/${TEST_DIRECTORY}"
     if [ "$USE_ZIPAPEX" = "y" ]; then
       # Put the zipapex files in front of the ld-library-path
-      export LD_LIBRARY_PATH="${ANDROID_DATA}/zipapex/${LIBRARY_DIRECTORY}:${LD_LIBRARY_PATH}"
+      export LD_LIBRARY_PATH="${ANDROID_DATA}/zipapex/${LIBRARY_DIRECTORY}:${ANDROID_ROOT}/${TEST_DIRECTORY}"
+      export DYLD_LIBRARY_PATH="${ANDROID_DATA}/zipapex/${LIBRARY_DIRECTORY}:${ANDROID_ROOT}/${TEST_DIRECTORY}"
+    else
+      export LD_LIBRARY_PATH="${ANDROID_ROOT}/${LIBRARY_DIRECTORY}:${ANDROID_ROOT}/${TEST_DIRECTORY}"
+      export DYLD_LIBRARY_PATH="${ANDROID_ROOT}/${LIBRARY_DIRECTORY}:${ANDROID_ROOT}/${TEST_DIRECTORY}"
     fi
-    export DYLD_LIBRARY_PATH="${ANDROID_ROOT}/${LIBRARY_DIRECTORY}:${ANDROID_ROOT}/${TEST_DIRECTORY}"
     export PATH="$PATH:$BIN_DIR"
 
     # Temporarily disable address space layout randomization (ASLR).