gn2bp: Add required include_dirs for `aidl` files am: b30d3716a3
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2327968
Change-Id: I655207b23b2d5feb88c3667f7e904b252e19b320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 4d0ed32..aae2765 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -9848,6 +9848,14 @@
"net/android/java/src/org/chromium/net/X509Util.java",
"url/android/java/src/org/chromium/url/IDNStringUtil.java",
],
+ aidl: {
+ include_dirs: [
+ "frameworks/base/core/java/",
+ ],
+ local_include_dirs: [
+ "base/android/java/src/",
+ ],
+ },
}
// GN: //net/android:net_android_java_enums_srcjar
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':