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

Commit 837e2823 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Use the specific export aidl folder of Bluetooth" into tm-dev am: 529ca8b6 

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

Change-Id: Ibdec0ae970770748ad891a53b990eb45f199f9ff
parents 509306ba 529ca8b6

Android.bp

+3 −3
Original line number Diff line number Diff line
@@ -285,7 +285,7 @@ java_defaults { 
            "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/Bluetooth/framework/aidl-export",

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

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

            "hardware/interfaces/graphics/common/aidl",
@@ -543,7 +543,7 @@ stubs_defaults { 
            "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/Bluetooth/framework/aidl-export",

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

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

            "hardware/interfaces/graphics/common/aidl",
@@ -583,7 +583,7 @@ stubs_defaults { 
    name: "module-classpath-stubs-defaults",

    aidl: {

        include_dirs: [

            "packages/modules/Bluetooth/system/binder",

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

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

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

        ],