commit 9fd65dc81a78c6d12dfe0eaa7f70b905a73a6343
author Cole Faust <colefaust@google.com> Tue Mar 07 23:10:32 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Mar 07 23:10:32 2023 +0000
tree e00152f97100b1f48a5c2a3f99f7ab1aee2c5ed3
parent 0b5879e17dce45d88c924250e2f475b39fff4913
parent 41228921c1537a1f77523cf3330a6333b29bef0c

Merge "Compile HalfSheetUX against framework-connectivity-t.impl"

framework-t/Android.bp

diff --git a/framework-t/Android.bp b/framework-t/Android.bp
index 7ef20c5..1a8d46b 100644
--- a/framework-t/Android.bp
+++ b/framework-t/Android.bp
@@ -156,7 +156,7 @@
         "//frameworks/opt/telephony/tests/telephonytests",
         "//packages/modules/CaptivePortalLogin/tests",
         "//packages/modules/Connectivity/Tethering/tests:__subpackages__",
-        "//packages/modules/Connectivity/nearby/tests:__subpackages__",
+        "//packages/modules/Connectivity/nearby:__subpackages__",
         "//packages/modules/Connectivity/tests:__subpackages__",
         "//packages/modules/IPsec/tests/iketests",
         "//packages/modules/NetworkStack/tests:__subpackages__",

nearby/halfsheet/Android.bp

diff --git a/nearby/halfsheet/Android.bp b/nearby/halfsheet/Android.bp
index 2d0d327..8011dc6 100644
--- a/nearby/halfsheet/Android.bp
+++ b/nearby/halfsheet/Android.bp
@@ -27,7 +27,7 @@
     certificate: ":com.android.nearby.halfsheetcertificate",
     libs: [
         "framework-bluetooth",
-        "framework-connectivity-t",
+        "framework-connectivity-t.impl",
         "nearby-service-string",
     ],
     static_libs: [