Merge changes from topic "conn_t_move_stageaosp" into stage-aosp-master am: d492a534e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378905 Change-Id: If80b91ea42a838c12f2b21fcf29093b741831566 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -271,8 +271,6 @@ java_defaults {
|
||||
include_dirs: [
|
||||
"frameworks/av/aidl",
|
||||
"frameworks/native/libs/permission/aidl",
|
||||
// TODO: remove when moved to the below package
|
||||
"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
|
||||
"packages/modules/Connectivity/framework/aidl-export",
|
||||
"packages/modules/Media/apex/aidl/stable",
|
||||
],
|
||||
@@ -519,8 +517,6 @@ stubs_defaults {
|
||||
include_dirs: [
|
||||
"frameworks/av/aidl",
|
||||
"frameworks/native/libs/permission/aidl",
|
||||
// TODO: remove when moved to the below package
|
||||
"frameworks/base/packages/ConnectivityT/framework-t/aidl-export",
|
||||
"packages/modules/Connectivity/framework/aidl-export",
|
||||
],
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user