Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6a575b7d authored by Remi NGUYEN VAN's avatar Remi NGUYEN VAN Committed by Automerger Merge Worker
Browse files

Merge changes from topic "conn_t_move_tmdev" into tm-dev am: d6474d0e 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378069



Change-Id: I4f13c227a9bce0cb905501402be3803d5e5d4921
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2eacf502 d6474d0e

Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -272,8 +272,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/Bluetooth/framework/aidl-export",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",
@@ -531,8 +529,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/Bluetooth/framework/aidl-export",

            "packages/modules/Connectivity/framework/aidl-export",

            "packages/modules/Media/apex/aidl/stable",