commit c48003930930fb54e03c6e8ce23f94e1a378e23d
author Motomu Utsumi <motomuman@google.com> Mon Sep 11 11:48:36 2023 +0900
committer Motomu Utsumi <motomuman@google.com> Mon Sep 11 11:53:46 2023 +0900
tree c5c0fe24a5583ab2c87f91e4540c88663886d77c
parent fcd2b7ccb0c9830ec91c0976f4c5881acb25219c
parent 89e9fac536832ac26c678e17abc0d09433a71e0d

Merge remote-tracking branch 'remotes/aosp/tmp_libs_net_move' into libs_net_move_merge

frameworks/libs/net/common ->
packages/modules/Connectivity/staticlibs

frameworks/libs/net/client-libs ->
packages/modules/Connectivity/staticlbs/client-libs

Test: TH
Bug: 296014682
Change-Id: I5dc78f0c4653e20312ab3d488b1e69262dbb9840

framework/Android.bp

diff --git a/framework/Android.bp b/framework/Android.bp
index e577e6d..bfbc3b9 100644
--- a/framework/Android.bp
+++ b/framework/Android.bp
@@ -175,11 +175,11 @@
         "//frameworks/base/core/tests/benchmarks",
         "//frameworks/base/core/tests/utillib",
         "//frameworks/base/tests/vcn",
-        "//frameworks/libs/net/common/testutils",
-        "//frameworks/libs/net/common/tests:__subpackages__",
         "//frameworks/opt/net/ethernet/tests:__subpackages__",
         "//frameworks/opt/telephony/tests/telephonytests",
         "//packages/modules/CaptivePortalLogin/tests",
+        "//packages/modules/Connectivity/staticlibs/testutils",
+        "//packages/modules/Connectivity/staticlibs/tests:__subpackages__",
         "//packages/modules/Connectivity/Cronet/tests:__subpackages__",
         "//packages/modules/Connectivity/Tethering/tests:__subpackages__",
         "//packages/modules/Connectivity/tests:__subpackages__",