Merge "Adding bt dependency"
diff --git a/nearby/framework/Android.bp b/nearby/framework/Android.bp
index 74980c9..fd7f2c9 100644
--- a/nearby/framework/Android.bp
+++ b/nearby/framework/Android.bp
@@ -59,7 +59,10 @@
name: "framework-nearby-pre-jarjar",
defaults: ["framework-nearby-defaults"],
sdk_version: "module_current",
- libs: ["framework-annotations-lib"],
+ libs: [
+ "framework-annotations-lib",
+ "framework-bluetooth",
+ ],
// java_api_finder must accompany `srcs` (`srcs` defined in `framework-nearby-defaults`)
plugins: ["java_api_finder"],
installable: false,
@@ -77,6 +80,7 @@
"framework-module-defaults", // the SDK needs to be usable in all processes
"framework-nearby-defaults",
],
+ libs: ["framework-bluetooth"],
jarjar_rules: ":nearby-jarjar-rules",
apex_available: [
diff --git a/nearby/halfsheet/Android.bp b/nearby/halfsheet/Android.bp
index 781f308..82d0933 100644
--- a/nearby/halfsheet/Android.bp
+++ b/nearby/halfsheet/Android.bp
@@ -26,6 +26,7 @@
plugins: ["java_api_finder"],
jarjar_rules: ":nearby-jarjar-rules",
libs: [
+ "framework-bluetooth",
"framework-nearby-pre-jarjar",
"nearby-service-string",
],
diff --git a/nearby/service/Android.bp b/nearby/service/Android.bp
index b80d677..5b0028e 100644
--- a/nearby/service/Android.bp
+++ b/nearby/service/Android.bp
@@ -36,6 +36,7 @@
java_library {
name: "nearby-service-string",
srcs: [":nearby-service-string-res"],
+ libs: ["framework-bluetooth"],
sdk_version: "module_current",
}
@@ -53,6 +54,7 @@
// pre-jarjar symbols are needed so that nearby-service can reference the original class
// names at compile time
"framework-nearby-pre-jarjar",
+ "framework-bluetooth.stubs.module_lib", // TODO(b/215722418): Change to framework-bluetooth once fixed
"error_prone_annotations",
],
static_libs: [