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

Commit a465b9fe authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Apply jarjar rules to NetworkStaticLibTests am: 35aa6f2e am: b8059b4e am: 7934dd15 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/NetworkStack/+/12034943

Change-Id: I75b1fa5e90c5c1b59f12abc313dc3a9e7defcaf5
parents 7fc4f8f4 7934dd15

tests/integration/Android.bp

+13 −1
Original line number Diff line number Diff line
@@ -82,6 +82,18 @@ android_test { 
    test_suites: ["device-tests"],

}



// The static lib needs to be jarjared by each module so they do not conflict with each other

// (e.g. wifi, system server, network stack need to use different package names when including it).

// Apply NetworkStack jarjar rules to the tests as well so classes in NetworkStaticLibTests have the

// same package names as in module code.

android_library {

    name: "NetworkStackStaticLibTestsLib",

    platform_apis: true,

    min_sdk_version: "29",

    jarjar_rules: ":NetworkStackJarJarRules",

    static_libs: ["NetworkStaticLibTestsLib"],

}



// Special version of the network stack tests that includes all tests necessary for code coverage

// purposes. This is currently the union of NetworkStackTests and NetworkStackIntegrationTests.

android_test {
@@ -95,7 +107,7 @@ android_test { 
    static_libs: [

        "NetworkStackTestsLib",

        "NetworkStackIntegrationTestsLib",

        "NetworkStaticLibTestsLib",

        "NetworkStackStaticLibTestsLib",

    ],

    compile_multilib: "both",

    manifest: "AndroidManifest_coverage.xml",