From c01e552e6fde3da0eeb5ceb5d5c67ed0a2b06766 Mon Sep 17 00:00:00 2001
From: William Escande <wescande@google.com>
Date: Fri, 25 Feb 2022 12:32:42 +0100
Subject: [PATCH] Use the specific export aidl folder of Bluetooth

Bug: 219528787
Test: build + start bt
Tag: #refactor

Change-Id: Ie0468a8d2933f9866fba2bec59b433446fab1938
---
 Android.bp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Android.bp b/Android.bp
index 55239868da78f..99e9ea306a4c7 100644
--- a/Android.bp
+++ b/Android.bp
@@ -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",
         ],