From 82f94056ced121acfb2d45067e3477cffae52621 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 Change-Id: I8acb39522541f1e06d1a4b69b7a53b328c202eff --- Android.bp | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/Android.bp b/Android.bp index af2f112bb6ae9..396a0fdc6afd6 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", @@ -238,12 +239,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, },