Merge changes from topic "conn_t_move_tmdev" into tm-dev am: d6474d0e4f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378069 Change-Id: I4f13c227a9bce0cb905501402be3803d5e5d4921 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -272,8 +272,6 @@ java_defaults {
|
|||||||
include_dirs: [
|
include_dirs: [
|
||||||
"frameworks/av/aidl",
|
"frameworks/av/aidl",
|
||||||
"frameworks/native/libs/permission/aidl",
|
"frameworks/native/libs/permission/aidl",
|
||||||
// TODO: remove when moved to the below package
|
|
||||||
"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
|
|
||||||
"packages/modules/Bluetooth/framework/aidl-export",
|
"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",
|
||||||
@@ -531,8 +529,6 @@ stubs_defaults {
|
|||||||
include_dirs: [
|
include_dirs: [
|
||||||
"frameworks/av/aidl",
|
"frameworks/av/aidl",
|
||||||
"frameworks/native/libs/permission/aidl",
|
"frameworks/native/libs/permission/aidl",
|
||||||
// TODO: remove when moved to the below package
|
|
||||||
"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
|
|
||||||
"packages/modules/Bluetooth/framework/aidl-export",
|
"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