BASELINE: Update Chromium to 91.0.4472.160

Change-Id: I0def1f08a2412aeed79a9ab95dd50eb5c3f65f31
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 33 insertions, 37 deletions

diff --git a/chromium/base/android/jni_generator/BUILD.gn b/chromium/base/android/jni_generator/BUILD.gn
index 65d00b23eb4..6898183ebc1 100644
--- a/chromium/base/android/jni_generator/BUILD.gn
+++ b/chromium/base/android/jni_generator/BUILD.gn
@@ -5,8 +5,6 @@
 import("//build/config/android/rules.gni")
 import("//testing/test.gni")
 
-_registration_header = "$target_gen_dir/sample_jni_registration.h"
-
 generate_jni("jni_sample_header") {
   sources = [
     "java/src/org/chromium/example/jni_generator/SampleForAnnotationProcessor.java",
@@ -20,20 +18,14 @@ android_library("jni_sample_java") {
     "java/src/org/chromium/example/jni_generator/SampleForTests.java",
   ]
 
-  deps = [
-    "//base:base_java",
-    "//base:jni_java",
-  ]
+  deps = [ "//base:base_java" ]
 
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
 android_library("jni_annotation_sample_java") {
   sources = [ "java/src/org/chromium/example/jni_generator/SampleForAnnotationProcessor.java" ]
-  deps = [
-    "//base:base_java",
-    "//base:jni_java",
-  ]
+  deps = [ "//base:base_java" ]
   annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
 }
 
@@ -48,37 +40,41 @@ source_set("jni_sample_native_side") {
   ]
 }
 
-shared_library("jni_sample_lib") {
-  sources = [
-    "sample_entry_point.cc",
-    _registration_header,
-  ]
-
-  deps = [
-    ":jni_sample_native_side",
-    ":sample_jni_apk__final_jni",  # For registration_header
-    "//base",
-  ]
-}
-
-android_apk("sample_jni_apk") {
-  apk_name = "SampleJni"
-  android_manifest = "AndroidManifest.xml"
-  deps = [
-    ":jni_sample_java",
-    "//base:base_java",
-    "//base:jni_java",
-  ]
-  shared_libraries = [ ":jni_sample_lib" ]
-  jni_registration_header = _registration_header
+if (build_with_chromium) {
+  _registration_header = "$target_gen_dir/sample_jni_registration.h"
+
+  # "__final_jni" is not available when build_with_chromium == false.
+  shared_library("jni_sample_lib") {
+    sources = [
+      "sample_entry_point.cc",
+      _registration_header,
+    ]
+
+    deps = [
+      ":jni_sample_native_side",
+      ":sample_jni_apk__final_jni",  # For registration_header
+      "//base",
+    ]
+  }
+
+  android_apk("sample_jni_apk") {
+    apk_name = "SampleJni"
+    android_manifest = "AndroidManifest.xml"
+    deps = [
+      ":jni_sample_java",
+      "//base:base_java",
+    ]
+    shared_libraries = [ ":jni_sample_lib" ]
+    jni_registration_header = _registration_header
+  }
 }
 
 # Serves to test that generated bindings compile properly.
 group("jni_generator_tests") {
-  deps = [
-    ":jni_annotation_sample_java",
-    ":sample_jni_apk",
-  ]
+  deps = [ ":jni_annotation_sample_java" ]
+  if (build_with_chromium) {
+    deps += [ ":sample_jni_apk" ]
+  }
 }
 
 java_annotation_processor("jni_processor") {