Enabling Apex in BT
Bug: 217736913
Test: Compile, bringup and test user journeys
Change-Id: I3e796e3618ad9a077fa5e8ac387e314e896d1051
diff --git a/Android.bp b/Android.bp
index 933d1af..2bd61a4 100644
--- a/Android.bp
+++ b/Android.bp
@@ -132,7 +132,6 @@
":installd_aidl",
":libaudioclient_aidl",
":libbinder_aidl",
- ":libbluetooth-binder-aidl",
":libcamera_client_aidl",
":libcamera_client_framework_aidl",
":libupdate_engine_aidl",
@@ -273,7 +272,6 @@
defaults: ["framework-aidl-export-defaults"],
srcs: [
":framework-non-updatable-sources",
- ":framework-bluetooth-sources", // TODO(b/214988855) : Remove once framework-bluetooth jar is ready
"core/java/**/*.logtags",
":apex-info-list",
],
@@ -287,6 +285,7 @@
"frameworks/native/libs/permission/aidl",
// TODO: remove when moved to the below package
"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
+ "packages/modules/Bluetooth/system/binder",
"packages/modules/Connectivity/framework/aidl-export",
"packages/modules/Media/apex/aidl/stable",
"hardware/interfaces/graphics/common/aidl",
@@ -545,8 +544,9 @@
"frameworks/native/libs/permission/aidl",
// TODO: remove when moved to the below package
"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
- "packages/modules/Media/apex/aidl/stable",
+ "packages/modules/Bluetooth/system/binder",
"packages/modules/Connectivity/framework/aidl-export",
+ "packages/modules/Media/apex/aidl/stable",
"hardware/interfaces/graphics/common/aidl",
],
},
@@ -584,6 +584,7 @@
name: "module-classpath-stubs-defaults",
aidl: {
include_dirs: [
+ "packages/modules/Bluetooth/system/binder",
"packages/modules/Connectivity/framework/aidl-export",
"packages/modules/Media/apex/aidl/stable",
],