Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dfbfb231 authored by Felipe Leme's avatar Felipe Leme
Browse files

Changed ravenwood-junit to use module_current

Otherwise it cannot be used by mainline modules.

Test: atest --host AdServicesSharedLibrariesUnitTestsRavenwood
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
Bug: 335935200
Flag: TEST_ONLY

Change-Id: I75fc6f919ba7e45eb2fec825a2adc499a6be1b4f
Merged-In: I75fc6f919ba7e45eb2fec825a2adc499a6be1b4f
parent f491ad5e
Loading
Loading
Loading
Loading
+4 −1
Original line number Diff line number Diff line
@@ -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",
+2 −2
Original line number Diff line number Diff line
@@ -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