From 5ca8fe3cfdf1576f4a1f1d08dfffa1ee8182f4a6 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 23 Aug 2019 10:22:30 +0900 Subject: [PATCH] Use framework_native_aidl for AIDL files in frameworks/native/aidl The AIDL files under frameworks/native/aidl have been referenced via their absolute paths. This required any module that has an AIDL file depending on the AIDL types in the frameworks directory to explicitly set the include path. Fixing the problem by abstracting the AIDL files using filegroup where the path property is set to the base directory for the files. The base directory is used as include paths when the filegroup is added to srcs. Bug: 135922046 Test: m Test: m on sdk_phone_arm7 Merged-In: I8acb39522541f1e06d1a4b69b7a53b328c202eff (cherry picked from commit 82f94056ced121acfb2d45067e3477cffae52621) Change-Id: I8acb39522541f1e06d1a4b69b7a53b328c202eff --- Android.bp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Android.bp b/Android.bp index da785b8b2d77f..8439d1f930ad5 100644 --- a/Android.bp +++ b/Android.bp @@ -185,6 +185,7 @@ framework_srcs = [ // AIDL sources from external directories ":dumpstate_aidl", + ":framework_native_aidl", ":gatekeeper_aidl", ":gsiservice_aidl", ":incidentcompanion_aidl", @@ -237,12 +238,6 @@ java_defaults { srcs: framework_srcs, aidl: { - // TODO(b/70046217) remove this by moving the AIDL files into frameworks/base - // so that they are referenced via framework-core-sources - include_dirs: [ - "frameworks/native/aidl/binder", - "frameworks/native/aidl/gui", - ], generate_get_transaction_name: true, },