commit d84be86d243ea1aae634927c606a52041e589430
author Remi NGUYEN VAN <reminv@google.com> Tue Mar 22 16:35:45 2022 +0000
committer Remi NGUYEN VAN <reminv@google.com> Tue Mar 22 16:37:29 2022 +0000
tree 970fab9e30d5d0abf975289a35b12df3e211a27d
parent 8d63ed9d9c7e9803a37d2a20bc34d3862805a35f
parent bab43b1a5c0f0a7904283b92a4c5d6319234e54d

Merge history of Nearby

BUG: 222234190
TEST: TH
Merged-In: I7fd9cc67244f2533057e679b0bc5e1db126cd399
Change-Id: Ie7a308b2a0294a50467443dc935082c2e88d27f7

framework-t/Android.bp

diff --git a/framework-t/Android.bp b/framework-t/Android.bp
index f46d887..1ce96ee 100644
--- a/framework-t/Android.bp
+++ b/framework-t/Android.bp
@@ -114,7 +114,7 @@
         // In preparation for future move
         "//packages/modules/Connectivity/apex",
         "//packages/modules/Connectivity/service-t",
-        "//packages/modules/Nearby/service",
+        "//packages/modules/Connectivity/nearby/service",
         "//frameworks/base",
 
         // Tests using hidden APIs
@@ -131,10 +131,10 @@
         "//frameworks/opt/telephony/tests/telephonytests",
         "//packages/modules/CaptivePortalLogin/tests",
         "//packages/modules/Connectivity/Tethering/tests:__subpackages__",
+        "//packages/modules/Connectivity/nearby/tests:__subpackages__",
         "//packages/modules/Connectivity/tests:__subpackages__",
         "//packages/modules/IPsec/tests/iketests",
         "//packages/modules/NetworkStack/tests:__subpackages__",
-        "//packages/modules/Nearby/tests:__subpackages__",
         "//packages/modules/Wifi/service/tests/wifitests",
     ],
 }