commit 30bff89770bfb1efbccd5cc278b941790fb4899b
author Victor Chang <vichang@google.com> Wed Apr 24 13:33:05 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Apr 24 13:33:05 2019 +0000
tree b82cc8d5a2a72b7a1d4577b572c937b84c26d2b1
parent d8fa938c409aa38a0b4a04c900eb288ae03267e0
parent 904acf0d671da6e42902c9dcab8a108a033ca4dd

Merge "Re-enable test for System.loadLibrary("icuuc")" into qt-dev

tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp

diff --git a/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp b/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
index 7f7cde1..25f4b0e 100644
--- a/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
+++ b/tests/tests/jni/libjnitest/android_jni_cts_LinkerNamespacesTest.cpp
@@ -395,7 +395,7 @@
                   runtime_public_libraries,
                   // System.loadLibrary("icuuc") would fail since a copy exists in /system.
                   // TODO(b/124218500): Change to true when the bug is resolved.
-                  /*test_system_load_library=*/false,
+                  /*test_system_load_library=*/true,
                   check_absence, &errors)) {
     success = false;
   }

tests/tests/jni/src/android/jni/cts/JniStaticTest.java

diff --git a/tests/tests/jni/src/android/jni/cts/JniStaticTest.java b/tests/tests/jni/src/android/jni/cts/JniStaticTest.java
index 8604778..6f51d31 100644
--- a/tests/tests/jni/src/android/jni/cts/JniStaticTest.java
+++ b/tests/tests/jni/src/android/jni/cts/JniStaticTest.java
@@ -337,9 +337,8 @@
 
         for (String lib : libs) {
             File f = new File(systemBaseDir, lib);
-            // TODO (b/124218500): Re-enable this check when the app compat issue is resolved.
-            // assertFalse("The same native library should exist in the Runtime APEX."
-            //     + " It should not exist in /system: " + f , f.exists());
+            assertFalse("The same native library should exist in the Runtime APEX."
+                + " It should not exist in /system: " + f , f.exists());
             String error = LinkerNamespacesHelper.tryDlopen(f.toString());
             assertNotNull("The native library file does not exist in the file system, "
                 + "but dlopen(" + f + ", RTLD_NOW) succeeds.", error);