gn2bp: Add libs to `java_library`
* There is a lot of missing libraries that need to be added which are builtin AOSP such as androidx, android.
* The JNI preprocessor is missing and must be added manually.
Test: update_results && m cronet_aml_components_cronet_android_cronet
Change-Id: Ie243e11547e56daa5aaf15569b6bdd291f915877
diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 6b0ea67..3f1fb83 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -314,6 +314,7 @@
self.cppflags = set()
self.rtti = False
# Name of the output. Used for setting .so file name for libcronet
+ self.libs = set()
self.stem = None
self.compile_multilib = None
self.aidl = dict()
@@ -363,6 +364,7 @@
self._output_field(output, 'proto')
self._output_field(output, 'linker_scripts')
self._output_field(output, 'cppflags')
+ self._output_field(output, 'libs')
self._output_field(output, 'stem')
self._output_field(output, 'compile_multilib')
self._output_field(output, 'aidl')
@@ -1304,6 +1306,10 @@
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.libs = {
+ "androidx.annotation_annotation",
+ "jsr305",
+ }
module.aidl["include_dirs"] = {"frameworks/base/core/java/"}
module.aidl["local_include_dirs"] = {"base/android/java/src/"}
for dep in gn.java_actions: