Remove the dependency from "NearbyFastPairProviderSimulatorLib" to "service-nearby".
This change create a dedicated library for test only,
this library only pack the classes used in
"NearbyFastPairProviderSimulatorLib".
This make it safer to avoid misuse of other classes in "service-nearby".
Test: Maunal launch NearbyFastPairProviderSimulatorApp and pair with mainline FP seeker
Test: http://recall/-/cycSROwIosTzHgYDSIqPXl/fAWLYYQQMVCw0QWuefBU7v
Bug: 214015364
Ignore-AOSP-First: nearby_not_in_aosp_yet
Change-Id: Ibe1b1a99298e364890ce824ed9afc2e2a2fd1d2f
diff --git a/nearby/service/Android.bp b/nearby/service/Android.bp
index 802e2c8..7112bb1 100644
--- a/nearby/service/Android.bp
+++ b/nearby/service/Android.bp
@@ -41,6 +41,39 @@
sdk_version: "module_current",
}
+// Common lib for nearby end-to-end testing.
+java_library {
+ name: "nearby-common-lib",
+ srcs: [
+ "java/com/android/server/nearby/common/bloomfilter/*.java",
+ "java/com/android/server/nearby/common/bluetooth/*.java",
+ "java/com/android/server/nearby/common/bluetooth/fastpair/AesCtrMultipleBlockEncryption.java",
+ "java/com/android/server/nearby/common/bluetooth/fastpair/AesEcbSingleBlockEncryption.java",
+ "java/com/android/server/nearby/common/bluetooth/fastpair/BluetoothAddress.java",
+ "java/com/android/server/nearby/common/bluetooth/fastpair/BluetoothUuids.java",
+ "java/com/android/server/nearby/common/bluetooth/fastpair/Bytes.java",
+ "java/com/android/server/nearby/common/bluetooth/fastpair/Constants.java",
+ "java/com/android/server/nearby/common/bluetooth/fastpair/EllipticCurveDiffieHellmanExchange.java",
+ "java/com/android/server/nearby/common/bluetooth/fastpair/HmacSha256.java",
+ "java/com/android/server/nearby/common/bluetooth/fastpair/Ltv.java",
+ "java/com/android/server/nearby/common/bluetooth/fastpair/MessageStreamHmacEncoder.java",
+ "java/com/android/server/nearby/common/bluetooth/fastpair/NamingEncoder.java",
+ "java/com/android/server/nearby/common/bluetooth/testability/**/*.java",
+ "java/com/android/server/nearby/common/bluetooth/gatt/*.java",
+ "java/com/android/server/nearby/common/bluetooth/util/*.java",
+ ],
+ libs: [
+ "androidx.annotation_annotation",
+ "androidx.core_core",
+ "error_prone_annotations",
+ "framework-bluetooth",
+ "guava",
+ ],
+ sdk_version: "module_current",
+ visibility: [
+ "//packages/modules/Connectivity/nearby/tests/multidevices/clients/test_support/fastpair_provider",
+ ],
+}
// Main lib for nearby services.
java_library {
diff --git a/nearby/tests/multidevices/clients/test_support/fastpair_provider/Android.bp b/nearby/tests/multidevices/clients/test_support/fastpair_provider/Android.bp
index e01c436..298c9dc 100644
--- a/nearby/tests/multidevices/clients/test_support/fastpair_provider/Android.bp
+++ b/nearby/tests/multidevices/clients/test_support/fastpair_provider/Android.bp
@@ -34,11 +34,13 @@
],
static_libs: [
"NearbyFastPairProviderLiteProtos",
+ "androidx.core_core",
"androidx.test.core",
"error_prone_annotations",
"fast-pair-lite-protos",
"framework-annotations-lib",
+ "guava",
"kotlin-stdlib",
- "service-nearby-pre-jarjar",
+ "nearby-common-lib",
],
}
diff --git a/nearby/tests/multidevices/clients/test_support/fastpair_provider/simulator_app/Android.bp b/nearby/tests/multidevices/clients/test_support/fastpair_provider/simulator_app/Android.bp
index 87d352f..125c34e 100644
--- a/nearby/tests/multidevices/clients/test_support/fastpair_provider/simulator_app/Android.bp
+++ b/nearby/tests/multidevices/clients/test_support/fastpair_provider/simulator_app/Android.bp
@@ -25,6 +25,7 @@
// adb remount
// adb push ${ANDROID_PRODUCT_OUT}/system/app/NearbyFastPairProviderSimulatorApp /system/app/
// adb reboot
+// Grant all permissions requested to NearbyFastPairProviderSimulatorApp before launching it.
android_app {
name: "NearbyFastPairProviderSimulatorApp",
sdk_version: "test_current",