commit 418199230f35320b02f6c6c9526f4f264a382b55
author Remi NGUYEN VAN <reminv@google.com> Tue May 24 18:40:58 2022 +0900
committer Remi NGUYEN VAN <reminv@google.com> Thu Jul 21 18:57:13 2022 +0900
tree 187103b564a4aec4cf7d0b6aee579fe0cd7e92f1
parent a79c22737267ed0c8a46640294c33798778bf063

Do not depend on all of NetworkStack in CTS

Only depend on a newly created DhcpPacketLib library, which only
contains DhcpPacket classes for test usage purposes.

This avoids including the NetworkStack manifest, and many unnecessary
classes.

Test: atest CtsNetTestCases
Change-Id: I0047826ef8bb56f229b296f0b3c337b2de1fbc93

tests/cts/net/Android.bp

diff --git a/tests/cts/net/Android.bp b/tests/cts/net/Android.bp
index a6ed762..75dc50e 100644
--- a/tests/cts/net/Android.bp
+++ b/tests/cts/net/Android.bp
@@ -72,9 +72,9 @@
 android_test {
     name: "CtsNetTestCases",
     defaults: ["CtsNetTestCasesDefaults", "ConnectivityNextEnableDefaults"],
-    // TODO: CTS should not depend on the entirety of the networkstack code.
     static_libs: [
-        "NetworkStackApiCurrentLib",
+        "DhcpPacketLib",
+        "NetworkStackApiCurrentShims",
     ],
     test_suites: [
         "cts",
@@ -86,7 +86,8 @@
     name: "CtsNetTestCasesApiStableDefaults",
     // TODO: CTS should not depend on the entirety of the networkstack code.
     static_libs: [
-        "NetworkStackApiStableLib",
+        "DhcpPacketLib",
+        "NetworkStackApiStableShims",
     ],
     jni_uses_sdk_apis: true,
     min_sdk_version: "29",