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

Commit bedfae98 authored by Paul Duffin's avatar Paul Duffin
Browse files

Remove repackaged.android.test.mock 

The repackaged.android.test.mock uses internal APIs so cannot be built
against the SDK which means that anything that depends on it cannot
guarantee to run if those internal APIs change.

That library was built because the classes in
repackaged.android.test.runner depend on them. However, the
repackaged.android.test.runner library is only used by the
cts-api-signature-test target and it does not use any android.test.mock
classes directly, or indirectly. Therefore, this simply excludes any
classes from repackaged.android.test.runner that depend on
android.test.mock classes so that repackaged.android.test.mock can be
removed altogether.

Bug: 69899800
Bug: 30188076
Test: make checkbuild
Change-Id: If4528e6a4ec2b08faffd6d413672c5004d85e0a9
parent 2b6ba64c

test-mock/Android.bp

+0 −13
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
java_library {

    name: "android.test.mock",



    // Needs to be consistent with the repackaged version of this make target.

    java_version: "1.8",

    srcs: ["src/**/*.java"],
@@ -28,15 +27,3 @@ java_library { 
        "framework",

    ],

}
 


// Build the repackaged.android.test.mock library

// ==============================================

java_library_static {

    name: "repackaged.android.test.mock",



    static_libs: ["android.test.mock"],



    jarjar_rules: "jarjar-rules.txt",

    // Pin java_version until jarjar is certified to support later versions. http://b/72703434

    java_version: "1.8",

}

test-runner/Android.bp

+15 −2
Original line number Diff line number Diff line
@@ -56,8 +56,21 @@ java_library { 
java_library_static {

    name: "repackaged.android.test.runner",



    srcs: ["src/**/*.java"],

    exclude_srcs: [

        "src/android/test/ActivityUnitTestCase.java",

        "src/android/test/ApplicationTestCase.java",

        "src/android/test/IsolatedContext.java",

        "src/android/test/ProviderTestCase.java",

        "src/android/test/ProviderTestCase2.java",

        "src/android/test/RenamingDelegatingContext.java",

        "src/android/test/ServiceTestCase.java",

    ],



    sdk_version: "current",

    static_libs: ["android.test.runner"],

    libs: [

        "android.test.base",

    ],



    jarjar_rules: "jarjar-rules.txt",

    // Pin java_version until jarjar is certified to support later versions. http://b/72703434