commit 2ee8a45a8b4b33547383efcfd4a8c46e610084cb
author Cole Faust <colefaust@google.com> Tue Mar 07 23:52:48 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Mar 07 23:52:48 2023 +0000
tree 105ff2c8443634352ba93e37d6439c8c9fe13a30
parent 1e092386f43cdba16279f7f926c7491f57ac8aac
parent 9fd65dc81a78c6d12dfe0eaa7f70b905a73a6343

Merge "Compile HalfSheetUX against framework-connectivity-t.impl" am: 9fd65dc81a

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2472785

Change-Id: Ic5e59cf631c6fcdb572743257abd59f003257347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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: [