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

Commit 55672eec authored by Lorenzo Colitti's avatar Lorenzo Colitti
Browse files

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
Change-Id: Id0f5ef4c99d242c6a42853c3ca03fba41b14f535
parent a331c3a7

Android.bp

+14 −14
Original line number Diff line number Diff line
@@ -197,6 +197,13 @@ android_library { 
    ],

    static_libs: ["NetworkStackApiCurrentShims"],

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

    ],

}



android_library {
@@ -208,6 +215,13 @@ android_library { 
    ],

    static_libs: ["NetworkStackApiStableShims"],

    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 {
@@ -216,7 +230,6 @@ filegroup { 
    visibility: [

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

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

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

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

    ]

}
@@ -284,19 +297,6 @@ android_app { 
    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 {

    name: "libnetworkstackutilsjni",

    srcs: [