commit 89f38e4c615068737d46b33fac9d002ef248cabe
author Mohannad Farrag <aymanm@google.com> Tue Dec 06 18:54:46 2022 +0000
committer Motomu Utsumi <motomuman@google.com> Mon Dec 12 01:52:54 2022 +0000
tree 8ee22acf9ab3a37ef1f13afb5879d52813d014e5
parent 3d3d6136f80f59bd544f195771d0c832ca1893c2

gn2bp: Add required libs to `JniGenerator`

* I do not expect this to change in the nearby future hence it can be hardcoded. However, I'm not satisfied and might think of introducing some design change later once we get this to build.

Test: update_results && m cronet_aml_components_cronet_android_cronet
Change-Id: Ie24c622323e8994fdd0b7fc3a2a62bcbadb50067

tools/gn2bp/Android.bp.swp

diff --git a/tools/gn2bp/Android.bp.swp b/tools/gn2bp/Android.bp.swp
index 8378cb5..76075af 100644
--- a/tools/gn2bp/Android.bp.swp
+++ b/tools/gn2bp/Android.bp.swp
@@ -9869,10 +9869,21 @@
 java_plugin {
     name: "cronet_aml_java_jni_annotation_preprocessor",
     srcs: [
+        ":cronet_aml_build_android_build_config_gen",
+        "base/android/java/src/org/chromium/base/JniException.java",
+        "base/android/java/src/org/chromium/base/JniStaticTestMocker.java",
+        "base/android/java/src/org/chromium/base/NativeLibraryLoadedStatus.java",
+        "base/android/java/src/org/chromium/base/annotations/NativeMethods.java",
         "base/android/jni_generator/java/src/org/chromium/jni_generator/JniProcessor.java",
         "build/android/java/src/org/chromium/build/annotations/CheckDiscard.java",
         "build/android/java/src/org/chromium/build/annotations/MainDex.java",
     ],
+    static_libs: [
+        "auto_service_annotations",
+        "guava",
+        "javapoet",
+    ],
+    processor_class: "org.chromium.jni_generator.JniProcessor",
 }
 
 // GN: //net/android:net_android_java_enums_srcjar

tools/gn2bp/gen_android_bp

diff --git a/tools/gn2bp/gen_android_bp b/tools/gn2bp/gen_android_bp
index 9303c91..d0b82f2 100755
--- a/tools/gn2bp/gen_android_bp
+++ b/tools/gn2bp/gen_android_bp
@@ -319,6 +319,7 @@
     self.compile_multilib = None
     self.aidl = dict()
     self.plugins = set()
+    self.processor_class = None
 
   def to_string(self, output):
     if self.comment:
@@ -370,6 +371,7 @@
     self._output_field(output, 'compile_multilib')
     self._output_field(output, 'aidl')
     self._output_field(output, 'plugins')
+    self._output_field(output, 'processor_class')
     if self.rtti:
       self._output_field(output, 'rtti')
 
@@ -1314,7 +1316,18 @@
     # no target should ever expect to package an annotation processor.
     "build/android/java/src/org/chromium/build/annotations/CheckDiscard.java",
     "build/android/java/src/org/chromium/build/annotations/MainDex.java",
+    "base/android/java/src/org/chromium/base/JniStaticTestMocker.java",
+    "base/android/java/src/org/chromium/base/NativeLibraryLoadedStatus.java",
+    "base/android/java/src/org/chromium/base/annotations/NativeMethods.java",
+    "base/android/java/src/org/chromium/base/JniException.java",
+    ":cronet_aml_build_android_build_config_gen",
   ])
+  module.static_libs.update({
+      "javapoet",
+      "guava",
+      "auto_service_annotations",
+  })
+  module.processor_class = "org.chromium.jni_generator.JniProcessor"
   blueprint.add_module(module)
   return module