commit 55672eec6d4dfbb3118d7f0627044246a481d8d4
author Lorenzo Colitti <lorenzo@google.com> Mon Mar 01 16:10:19 2021 +0900
committer Lorenzo Colitti <lorenzo@google.com> Mon Mar 01 17:20:06 2021 +0900
tree 55b6e404978ca33fa504f825ac78ce77a560ca7b
parent a331c3a7f08d0750bfd32ce1cc569bd1f5850b94

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

Android.bp

diff --git a/Android.bp b/Android.bp
index 149245e..eb44572 100644
--- a/Android.bp
+++ b/Android.bp
@@ -197,6 +197,13 @@
     ],
     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 @@
     ],
     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 @@
     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 @@
     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: [