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

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

Merge "Do not apply jarjar rules on intermediate libs" am: fcc10244 am: a3f506fd 

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

Change-Id: I33584fe19133f2cfb206c3679eefc0ed9ca3cd44
parents 512c6786 a3f506fd

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ filegroup { 
    visibility: [

        "//packages/modules/NetworkStack/tests/unit",

        "//packages/modules/NetworkStack/tests/integration",

        "//packages/modules/Connectivity/tests:__subpackages__",

        "//packages/modules/Connectivity/Tethering/tests/integration",

    ]

}

tests/integration/Android.bp

+4 −16
Original line number Diff line number Diff line
@@ -50,7 +50,6 @@ java_defaults { 
        "android.test.base",

        "android.test.mock",

    ],

    jarjar_rules: ":NetworkStackJarJarRules",

    visibility: ["//visibility:private"],

}
@@ -73,6 +72,7 @@ android_test { 
    test_suites: ["device-tests"],

    min_sdk_version: "29",

    target_sdk_version: "30",

    jarjar_rules: ":NetworkStackJarJarRules",

}



// Network stack next integration tests.
@@ -88,21 +88,7 @@ android_test { 
    certificate: "networkstack",

    platform_apis: true,

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

        "NetdStaticLibTestsLib",

    ],

}



// Special version of the network stack tests that includes all tests necessary for code coverage
@@ -120,8 +106,10 @@ android_test { 
        "modules-utils-native-coverage-listener",

        "NetworkStackTestsLib",

        "NetworkStackIntegrationTestsLib",

        "NetworkStackStaticLibTestsLib",

        "NetworkStaticLibTestsLib",

        "NetdStaticLibTestsLib",

    ],

    compile_multilib: "both",

    manifest: "AndroidManifest_coverage.xml",

    jarjar_rules: ":NetworkStackJarJarRules",

}

tests/unit/Android.bp

+2 −1
Original line number Diff line number Diff line
@@ -47,7 +47,6 @@ java_defaults { 
        "libnetworkstackutilsjni",

    ],

    jni_uses_sdk_apis: true,

    jarjar_rules: ":NetworkStackJarJarRules",

}



// Tests for NetworkStackNext.
@@ -64,6 +63,7 @@ android_test { 
    defaults: ["NetworkStackTestsDefaults"],

    static_libs: ["NetworkStackApiCurrentLib"],

    compile_multilib: "both", // Workaround for b/147785146 for mainline-presubmit

    jarjar_rules: ":NetworkStackJarJarRules",

}



// Library containing the unit tests. This is used by the coverage test target to pull in the
@@ -93,6 +93,7 @@ android_test { 
    defaults: ["NetworkStackTestsDefaults"],

    static_libs: ["NetworkStackApiStableLib"],

    compile_multilib: "both",

    jarjar_rules: ":NetworkStackJarJarRules",

}



// Additional dependencies of libnetworkstackutilsjni that are not provided by the system when