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

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

Remove repackaged.android.test... libraries 

Repackaging is now being done by the CTS signature tests that break if
they used the original classes from the shared libraries. This change
removes the repackaged.android.test... libraries.

Bug: 209607558
Test: cts/tests/signature/runSignatureTests.sh
Change-Id: I8745fc7b41099f9f15d76a4e9d7cf6b15e794b92
parent 128ebcdb

test-base/Android.bp

+8 −21
Original line number Diff line number Diff line
@@ -72,11 +72,16 @@ java_sdk_library { 


// Build the android.test.base_static library

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

// This is only intended for inclusion in the android.test.runner-minus-junit,

// robolectric_android-all-stub and repackaged.android.test.* libraries.

// This is only intended for use by the android.test.runner-minus-junit

// library.

//

// Must not be used elsewhere.

//

java_library_static {

    name: "android.test.base_static",

    visibility: [

        "//frameworks/base/test-runner",

    ],

    installable: false,



    srcs: [":android-test-base-sources"],
@@ -91,28 +96,10 @@ java_library_static { 
    sdk_version: "current",

}



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

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

// This contains repackaged versions of the classes from

// android.test.base.

java_library_static {

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



    sdk_version: "current",

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



    jarjar_rules: "jarjar-rules.txt",

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

    java_version: "1.8",

}



// Build the android.test.base-minus-junit library

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

// This contains the android.test classes from android.test.base plus

// the com.android.internal.util.Predicate[s] classes. This is only

// intended for inclusion in android.test.legacy and in

// android.test.base-hiddenapi-annotations to avoid a dependency cycle and must

// not be used elsewhere.

// the com.android.internal.util.Predicate[s] classes.

java_library_static {

    name: "android.test.base-minus-junit",

test-base/jarjar-rules.txt

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
rule junit.** repackaged.junit.@1

rule android.test.** repackaged.android.test.@1

rule com.android.internal.util.** repackaged.com.android.internal.util.@1

test-runner/Android.bp

+0 −26
Original line number Diff line number Diff line
@@ -79,32 +79,6 @@ java_library { 
    ],

}



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

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

java_library_static {

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



    srcs: [":android-test-runner-sources"],

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

    libs: [

        "android.test.base_static",

    ],



    jarjar_rules: "jarjar-rules.txt",

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

    java_version: "1.8",

}



// Make the current.txt available for use by the cts/tests/signature tests.

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

filegroup {

test-runner/jarjar-rules.txt

deleted120000 → 0
+0 −1
Original line number Diff line number Diff line 
../test-base/jarjar-rules.txt
 
 No newline at end of file