diff options
-rw-r--r-- | ravenwood/Android.bp | 5 | ||||
-rw-r--r-- | ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java | 4 |
2 files changed, 6 insertions, 3 deletions
diff --git a/ravenwood/Android.bp b/ravenwood/Android.bp index e2eb09f0d9d6..8d89cc1f4a9b 100644 --- a/ravenwood/Android.bp +++ b/ravenwood/Android.bp @@ -182,6 +182,9 @@ java_library { // want to verify they're unbundled. The "impl" library above is what // ships inside the Ravenwood environment to actually drive any API // access to implementation details. +// This library needs to be statically linked to mainline tests as well, +// which need to be able to run on multiple API levels, so we can't use +// test APIs in this module. java_library { name: "ravenwood-junit", srcs: [ @@ -189,7 +192,7 @@ java_library { "junit-stub-src/**/*.java", "junit-flag-src/**/*.java", ], - sdk_version: "test_current", + sdk_version: "module_current", static_libs: [ "ravenwood-runtime-common", "ravenwood-runtime-common-device", diff --git a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java index 68b5aebe9c00..825c91a1b6dc 100644 --- a/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java +++ b/ravenwood/junit-src/android/platform/test/ravenwood/RavenwoodRule.java @@ -18,7 +18,7 @@ package android.platform.test.ravenwood; import static android.os.Process.FIRST_APPLICATION_UID; import static android.os.Process.SYSTEM_UID; -import static android.os.UserHandle.USER_SYSTEM; +import static android.os.UserHandle.SYSTEM; import static org.junit.Assert.fail; @@ -115,7 +115,7 @@ public class RavenwoodRule implements TestRule { private static final AtomicInteger sNextPid = new AtomicInteger(100); - int mCurrentUser = USER_SYSTEM; + int mCurrentUser = SYSTEM.getIdentifier(); /** * Unless the test author requests differently, run as "nobody", and give each collection of |