diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-11 11:32:04 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2020-03-18 13:40:17 +0000 |
| commit | 31ccca0778db85c159634478b4ec7997f6704860 (patch) | |
| tree | 3d33fc3afd9d5ec95541e1bbe074a9cf8da12a0e /chromium/base/android/jni_generator | |
| parent | 248b70b82a40964d5594eb04feca0fa36716185d (diff) | |
| download | qtwebengine-chromium-31ccca0778db85c159634478b4ec7997f6704860.tar.gz | |
BASELINE: Update Chromium to 80.0.3987.136
Change-Id: I98e1649aafae85ba3a83e67af00bb27ef301db7b
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
Diffstat (limited to 'chromium/base/android/jni_generator')
| -rw-r--r-- | chromium/base/android/jni_generator/BUILD.gn | 9 | ||||
| -rw-r--r-- | chromium/base/android/jni_generator/config.gni | 8 |
2 files changed, 14 insertions, 3 deletions
diff --git a/chromium/base/android/jni_generator/BUILD.gn b/chromium/base/android/jni_generator/BUILD.gn index 83d4b3ea3e5..0ea87c5066d 100644 --- a/chromium/base/android/jni_generator/BUILD.gn +++ b/chromium/base/android/jni_generator/BUILD.gn @@ -97,17 +97,20 @@ java_annotation_processor("jni_processor") { # 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", + "//base/android/java/src/org/chromium/base/annotations/CheckDiscard.java", ] main_class = "org.chromium.jni_generator.JniProcessor" - annotation_processor_deps = [ "//third_party/auto:auto_service_processor" ] + annotation_processor_deps = + [ "//third_party/android_deps:auto_service_processor" ] deps = [ "//base:jni_java", + "//third_party/android_deps:com_google_auto_service_auto_service_annotations_java", + "//third_party/android_deps:com_google_guava_guava_java", "//third_party/android_deps:com_squareup_javapoet_java", - "//third_party/auto:auto_service_java", - "//third_party/guava:guava_java", + "//third_party/android_deps:javax_annotation_jsr250_api_java", ] srcjar_deps = [ ":processor_args_java" ] diff --git a/chromium/base/android/jni_generator/config.gni b/chromium/base/android/jni_generator/config.gni new file mode 100644 index 00000000000..5afbb3fbb6a --- /dev/null +++ b/chromium/base/android/jni_generator/config.gni @@ -0,0 +1,8 @@ +# Copyright 2019 The Chromium Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# Including this is an android_apk's processor_args_javac list will result in +# the JNI processor not writing a dummy GEN_JNI class. This is required when +# using proxy natives in android_apk targets. +skip_gen_jni_arg = "org.chromium.chrome.skipGenJni" |