commit 678277cc03b1530dc50a2491fb5d746566efbc73
author Remi NGUYEN VAN <reminv@google.com> Tue May 11 13:37:06 2021 +0000
committer Remi NGUYEN VAN <reminv@google.com> Thu May 13 05:55:44 2021 +0000
tree 0a7308308498bcc401eb5e45744e19c2107b59d0
parent c7b7320f9d3c3ffaf5cafb9c17ef770961e8793a

Move net unit tests to packages/Connectivity

Move the tests together with packages/Connectivity code, so both can be
moved to packages/modules/Connectivity together.

Also reorganize unit tests in a unit/ directory, as other tests
(integration/, common/ etc.) have been added in tests/net since they
were created. This makes the directory structure consistent.

Test: atest FrameworksNetTests
Bug: 187814163
Ignore-AOSP-First: needs per-branch move for merge conflicts
Change-Id: I254ffd1c08ec058d594b4ea55cbae5505f8497cc

framework/Android.bp

diff --git a/framework/Android.bp b/framework/Android.bp
index bb93af9..a75792c 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -102,7 +102,7 @@
         // Tests using hidden APIs
         "//cts/tests/netlegacy22.api",
         "//external/sl4a:__subpackages__",
-        "//frameworks/base/tests/net:__subpackages__",
+        "//frameworks/base/packages/Connectivity/tests:__subpackages__",
         "//frameworks/libs/net/common/testutils",
         "//frameworks/libs/net/common/tests:__subpackages__",
         "//frameworks/opt/telephony/tests/telephonytests",