summaryrefslogtreecommitdiffstats
path: root/chromium/base/android/jni_generator/BUILD.gn
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-20 13:40:20 +0100
committerAllan Sandfeld Jensen <allan.jensen@qt.io>2020-01-22 12:41:23 +0000
commit7961cea6d1041e3e454dae6a1da660b453efd238 (patch)
treec0eeb4a9ff9ba32986289c1653d9608e53ccb444 /chromium/base/android/jni_generator/BUILD.gn
parentb7034d0803538058e5c9d904ef03cf5eab34f6ef (diff)
BASELINE: Update Chromium to 78.0.3904.130
Change-Id: If185e0c0061b3437531c97c9c8c78f239352a68b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/base/android/jni_generator/BUILD.gn')
-rw-r--r--chromium/base/android/jni_generator/BUILD.gn8
1 files changed, 7 insertions, 1 deletions
diff --git a/chromium/base/android/jni_generator/BUILD.gn b/chromium/base/android/jni_generator/BUILD.gn
index 691e584087d..dc671366bab 100644
--- a/chromium/base/android/jni_generator/BUILD.gn
+++ b/chromium/base/android/jni_generator/BUILD.gn
@@ -91,7 +91,13 @@ java_cpp_template("processor_args_java") {
}
java_annotation_processor("jni_processor") {
- java_files = [ "java/src/org/chromium/jni_generator/JniProcessor.java" ]
+ java_files = [
+ "java/src/org/chromium/jni_generator/JniProcessor.java",
+
+ # Avoids a circular dependency with base:base_java. This is okay because
+ # no target should ever expect to package an annotation processor.
+ "//base/android/java/src/org/chromium/base/annotations/MainDex.java",
+ ]
main_class = "org.chromium.jni_generator.JniProcessor"