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

Commit 0c126226 authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

DO NOT MERGE: Delete TestNetworkStackLib and reduce NetworkStack lib visibility. 

TestNetworkStackLib is unused now that its callers have been
migrated to NetworkStackApi{Current,Stable}Lib. Remove it.

Also limit visibility of NetworkStackApi{Current,Stable}Lib,
since it's basically the entirety of networkstack code.

Test: m
Bug: 167645754
Ignore-AOSP-First: conflict with "enabled: false" in mainline-prod
Change-Id: Id0f5ef4c99d242c6a42853c3ca03fba41b14f535
parent bd132080

Android.bp

+14 −14
Original line number Original line Diff line number Diff line
@@ -200,6 +200,13 @@ android_library { 
    static_libs: ["NetworkStackApiCurrentShims"],

    static_libs: ["NetworkStackApiCurrentShims"],

    manifest: "AndroidManifestBase.xml",

    manifest: "AndroidManifestBase.xml",

    enabled: false, // Disabled in mainline-prod

    enabled: false, // Disabled in mainline-prod

    visibility: [

        "//frameworks/base/tests/net/integration",

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

        "//packages/modules/Connectivity/tests/cts/net",

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

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

    ],

}

}





android_library {

android_library {
@@ -211,6 +218,13 @@ android_library { 
    ],

    ],

    static_libs: ["NetworkStackApiStableShims"],

    static_libs: ["NetworkStackApiStableShims"],

    manifest: "AndroidManifestBase.xml",

    manifest: "AndroidManifestBase.xml",

    visibility: [

        "//frameworks/base/tests/net/integration",

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

        "//packages/modules/Connectivity/tests/cts/net",

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

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

    ],

}

}





filegroup {

filegroup {
@@ -219,7 +233,6 @@ filegroup { 
    visibility: [

    visibility: [

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

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

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

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

        "//frameworks/base/packages/Tethering/tests/integration",

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

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

    ]

    ]

}

}
@@ -290,19 +303,6 @@ android_app { 
    updatable: true,

    updatable: true,

}

}





// Android library to derive test APKs for integration tests

android_library {

    name: "TestNetworkStackLib",

    defaults: ["NetworkStackAppDefaults", "NetworkStackReleaseApiLevel"],

    static_libs: ["NetworkStackApiStableLib"],

    manifest: "AndroidManifestBase.xml",

    visibility: [

        "//frameworks/base/tests/net/integration",

        "//cts/tests/tests/net",

        "//packages/modules/Connectivity/tests/cts/net",

    ],

}



cc_library_shared {

cc_library_shared {

    name: "libnetworkstackutilsjni",

    name: "libnetworkstackutilsjni",

    srcs: [

    srcs: [