Merge "Changed ravenwood-junit to use module_current" into aosp-main-future

// 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: [

        "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",

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;

    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