commit 6ca7e09e60b89e8d5b4f0b053a596997f418dd78
author Mohannad Farrag <aymanm@google.com> Mon Dec 12 02:40:04 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon Dec 12 02:40:04 2022 +0000
tree 8ee22acf9ab3a37ef1f13afb5879d52813d014e5
parent 4542479e62ba6a16071f44a6c749f31b034b54be
parent 89f38e4c615068737d46b33fac9d002ef248cabe

gn2bp: Add required libs to `JniGenerator` am: 89f38e4c61

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/2327971

Change-Id: Ib238c0a008a7390687a7241d997b43d92ec5031a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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