gn2bp: Add required include_dirs for `aidl` files
* aidl files need their own local_include_dirs. It seems that there is a bug with IParentProcess.aidl as it doesn't declare an explicit dependency on "android.os.Bundle" yet it tries to use it. So I'm not sure how to fix that other than adding that missing dependency to the IParentProcess.aidl file.
Test: update_results && m cronet_aml_components_cronet_android_cronet
Change-Id: I40b5546287a6876f43e0c90040d5b8e9472773fe
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 42cb494..6b0ea67 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -316,6 +316,7 @@
# Name of the output. Used for setting .so file name for libcronet
self.stem = None
self.compile_multilib = None
+ self.aidl = dict()
def to_string(self, output):
if self.comment:
@@ -364,6 +365,7 @@
self._output_field(output, 'cppflags')
self._output_field(output, 'stem')
self._output_field(output, 'compile_multilib')
+ self._output_field(output, 'aidl')
if self.rtti:
self._output_field(output, 'rtti')
@@ -1302,6 +1304,8 @@
bp_module_name = module_prefix + 'java'
module = Module('java_library', bp_module_name, '//gn:java')
module.srcs.update([gn_utils.label_to_path(source) for source in gn.java_sources])
+ module.aidl["include_dirs"] = {"frameworks/base/core/java/"}
+ module.aidl["local_include_dirs"] = {"base/android/java/src/"}
for dep in gn.java_actions:
target = gn.get_target(dep)
if target.script == '//build/android/gyp/gcc_preprocess.py':