Merge "Use the specific export aidl folder of Bluetooth" into tm-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
529ca8b641
@@ -285,7 +285,7 @@ java_defaults {
|
|||||||
"frameworks/native/libs/permission/aidl",
|
"frameworks/native/libs/permission/aidl",
|
||||||
// TODO: remove when moved to the below package
|
// TODO: remove when moved to the below package
|
||||||
"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
|
"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
|
||||||
"packages/modules/Bluetooth/system/binder",
|
"packages/modules/Bluetooth/framework/aidl-export",
|
||||||
"packages/modules/Connectivity/framework/aidl-export",
|
"packages/modules/Connectivity/framework/aidl-export",
|
||||||
"packages/modules/Media/apex/aidl/stable",
|
"packages/modules/Media/apex/aidl/stable",
|
||||||
"hardware/interfaces/graphics/common/aidl",
|
"hardware/interfaces/graphics/common/aidl",
|
||||||
@@ -543,7 +543,7 @@ stubs_defaults {
|
|||||||
"frameworks/native/libs/permission/aidl",
|
"frameworks/native/libs/permission/aidl",
|
||||||
// TODO: remove when moved to the below package
|
// TODO: remove when moved to the below package
|
||||||
"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
|
"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
|
||||||
"packages/modules/Bluetooth/system/binder",
|
"packages/modules/Bluetooth/framework/aidl-export",
|
||||||
"packages/modules/Connectivity/framework/aidl-export",
|
"packages/modules/Connectivity/framework/aidl-export",
|
||||||
"packages/modules/Media/apex/aidl/stable",
|
"packages/modules/Media/apex/aidl/stable",
|
||||||
"hardware/interfaces/graphics/common/aidl",
|
"hardware/interfaces/graphics/common/aidl",
|
||||||
@@ -583,7 +583,7 @@ stubs_defaults {
|
|||||||
name: "module-classpath-stubs-defaults",
|
name: "module-classpath-stubs-defaults",
|
||||||
aidl: {
|
aidl: {
|
||||||
include_dirs: [
|
include_dirs: [
|
||||||
"packages/modules/Bluetooth/system/binder",
|
"packages/modules/Bluetooth/framework/aidl-export",
|
||||||
"packages/modules/Connectivity/framework/aidl-export",
|
"packages/modules/Connectivity/framework/aidl-export",
|
||||||
"packages/modules/Media/apex/aidl/stable",
|
"packages/modules/Media/apex/aidl/stable",
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user