commit 5d9f8ed872e0ccccfe39b5a3b41b277ca66c1b63
author Lorenzo Colitti <lorenzo@google.com> Tue Jan 21 15:31:06 2020 +0900
committer Lorenzo Colitti <lorenzo@google.com> Tue Jan 21 15:52:34 2020 +0900
tree 5c780ce38185c28d05eb336234209c26961a1129
parent e14bd343e09fff9faafd0346300d794d5da8810c

Run NetworkStaticLibTests on the actual source files.

Currently, NetworkStaticLibTests tests the class files that are
on the bootclasspath of the device. This makes running these
tests slow and/or confusing, because the framework must be
rebuilt and the device flashed before running the tests, and if
this is not done, the old code will be tested instead.

Instead, jarjar the tests so the test can be run without updating
the device.

Bug: 142892223
Test: atest NetworkStaticLibTests passes on device that does not have the library
Change-Id: I6a0dbebddbd0b64e2722078345ffe6b0c0a1801e

staticlibs/Android.bp

diff --git a/staticlibs/Android.bp b/staticlibs/Android.bp
index 713a0d6..3f867fc 100644
--- a/staticlibs/Android.bp
+++ b/staticlibs/Android.bp
@@ -40,6 +40,7 @@
         "//frameworks/opt/telephony",
         "//packages/modules/NetworkStack",
         "//packages/modules/CaptivePortalLogin",
+        "//frameworks/libs/net/common/tests:__subpackages__",
     ]
 }
 
@@ -53,6 +54,7 @@
         "//frameworks/opt/net/ike",
         "//packages/modules/NetworkStack",
         "//packages/modules/CaptivePortalLogin",
+        "//frameworks/libs/net/common/tests:__subpackages__",
     ],
 }