Skip to content

Commit

Permalink
jni_zero: moving generate_jni gn template into third_party
Browse files Browse the repository at this point in the history
Bug: 1456762
Change-Id: I5290699bc389291beeb2b2b8dd4f52ff8206f85b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4844132
Commit-Queue: Sam Maier <smaier@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1194104}
  • Loading branch information
Sam Maier authored and Chromium LUCI CQ committed Sep 8, 2023
1 parent af05998 commit 2cb3f6d
Show file tree
Hide file tree
Showing 231 changed files with 311 additions and 81 deletions.
1 change: 1 addition & 0 deletions android_webview/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import("//components/supervised_user/buildflags.gni")
import("//device/vr/buildflags/buildflags.gni")
import("//pdf/features.gni")
import("//printing/buildflags/buildflags.gni")
import("//third_party/jni_zero/jni_zero.gni")
import("//tools/grit/repack.gni")
import("//tools/resources/generate_resource_allowlist.gni")
import("//weblayer/variables.gni")
Expand Down
1 change: 1 addition & 0 deletions android_webview/js_sandbox/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

generate_jni("js_sandbox_jni_headers") {
sources = [
Expand Down
1 change: 1 addition & 0 deletions android_webview/nonembedded/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

generate_jni("nonembedded_jni_headers") {
sources = [
Expand Down
1 change: 1 addition & 0 deletions android_webview/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import("//build/config/android/rules.gni")
import("//build/config/python.gni")
import("//device/vr/buildflags/buildflags.gni")
import("//testing/test.gni")
import("//third_party/jni_zero/jni_zero.gni")

# Mark all targets as test only.
testonly = true
Expand Down
1 change: 1 addition & 0 deletions android_webview/test/embedded_test_server/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import("//build/config/android/config.gni")
import("//build/config/android/jni.gni")
import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("aw_net_java_test_support") {
testonly = true
Expand Down
1 change: 1 addition & 0 deletions base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ use_libevent = dep_libevent && !is_ios

if (is_android || is_robolectric) {
import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")
}

if (is_fuchsia) {
Expand Down
1 change: 1 addition & 0 deletions base/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import("//third_party/protobuf/proto_library.gni")

if (is_android) {
import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")
}

if (is_ios) {
Expand Down
64 changes: 0 additions & 64 deletions build/config/android/rules.gni
Original file line number Diff line number Diff line change
Expand Up @@ -127,70 +127,6 @@ if (enable_java_templates) {
if (build_with_chromium) {
import("//third_party/jni_zero/jni_zero.gni")
}

# Declare a jni target
#
# This target generates the native jni bindings for a set of .java files.
#
# See third_party/jni_zero/jni_generator.py for more info about the
# format of generating JNI bindings.
#
# Variables
# sources: list of .java files to generate jni for
# namespace: Specify the namespace for the generated header file.
# deps, public_deps: As normal
#
# Example
# # Target located in base/BUILD.gn.
# generate_jni("foo_jni") {
# # Generates gen/base/foo_jni/Foo_jni.h
# # To use: #include "base/foo_jni/Foo_jni.h"
# sources = [
# "android/java/src/org/chromium/foo/Foo.java",
# ...,
# ]
# }
template("generate_jni") {
generate_jni_impl(target_name) {
forward_variables_from(invoker, "*", TESTONLY_AND_VISIBILITY)
forward_variables_from(invoker, TESTONLY_AND_VISIBILITY)
metadata = {
jni_source_files = sources
}
}
}

# Declare a jni target for a prebuilt jar
#
# This target generates the native jni bindings for a set of classes in a .jar.
#
# See third_party/jni_zero/jni_generator.py for more info about the
# format of generating JNI bindings.
#
# Variables
# classes: list of .class files in the jar to generate jni for. These should
# include the full path to the .class file.
# jar_file: the path to the .jar. If not provided, will default to the sdk's
# android.jar
# unchecked_exceptions: Don't CHECK() for exceptions in generated stubs.
# This behaves as if every method had @CalledByNativeUnchecked.
# deps, public_deps: As normal
#
# Example
# # Target located in base/BUILD.gn.
# generate_jar_jni("foo_jni") {
# # Generates gen/base/foo_jni/Runnable_jni.h
# # To use: #include "base/foo_jni/Runnable_jni.h"
# classes = [
# "android/view/Foo.class",
# ]
# }
template("generate_jar_jni") {
generate_jni_impl(target_name) {
forward_variables_from(invoker, "*", TESTONLY_AND_VISIBILITY)
forward_variables_from(invoker, TESTONLY_AND_VISIBILITY)
}
}
} # enable_java_templates

# non-robolectric things
Expand Down
1 change: 1 addition & 0 deletions chrome/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ import("//device/vr/buildflags/buildflags.gni")
import("//printing/buildflags/buildflags.gni")
import("//testing/test.gni")
import("//third_party/icu/config.gni")
import("//third_party/jni_zero/jni_zero.gni")
import("//third_party/protobuf/proto_library.gni")
import("//tools/resources/generate_resource_allowlist.gni")
import("//weblayer/variables.gni")
Expand Down
1 change: 1 addition & 0 deletions chrome/android/features/cablev2_authenticator/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import("//build/config/android/rules.gni")
import("//chrome/android/modules/buildflags.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
srcjar_deps = [ ":jni_headers" ]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//chrome/common/features.gni")
import("//third_party/jni_zero/jni_zero.gni")
import("//tools/grit/grit_rule.gni")

generate_jni("jni") {
Expand Down
1 change: 1 addition & 0 deletions chrome/android/features/keyboard_accessory/public/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

generate_jni("jni") {
sources = [ "java/src/org/chromium/chrome/browser/keyboard_accessory/data/UserInfoField.java" ]
Expand Down
1 change: 1 addition & 0 deletions chrome/android/features/start_surface/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import("//build/config/locales.gni")
import("//chrome/browser/buildflags.gni")
import("//chrome/common/features.gni")
import("//components/feed/features.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_resources("java_resources") {
sources = [
Expand Down
1 change: 1 addition & 0 deletions chrome/android/features/vr/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import("//build/config/android/rules.gni")
import("//build/config/locales.gni")
import("//chrome/common/features.gni")
import("//device/vr/buildflags/buildflags.gni")
import("//third_party/jni_zero/jni_zero.gni")
import("//tools/grit/grit_rule.gni")

assert(enable_vr)
Expand Down
1 change: 1 addition & 0 deletions chrome/android/modules/dev_ui/provider/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
deps = [
Expand Down
1 change: 1 addition & 0 deletions chrome/android/modules/stack_unwinder/internal/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import("//build/config/android/jni.gni")
import("//build/config/android/rules.gni")
import("//chrome/android/modules/buildflags.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
srcjar_deps = [ ":jni_headers" ]
Expand Down
1 change: 1 addition & 0 deletions chrome/android/modules/stack_unwinder/provider/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
deps = [
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/android/browserservices/metrics/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
srcjar_deps = [ ":jni_headers" ]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
srcjar_deps = [ ":jni_headers" ]
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/android/httpclient/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
srcjar_deps = [ ":jni_headers" ]
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/android/messages/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
srcjar_deps = [ ":jni_headers" ]
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/android/metrics/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

if (is_android) {
import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

_jni_sources = [ "java/src/org/chromium/chrome/browser/metrics/AndroidSessionDurationsServiceState.java" ]

Expand Down
1 change: 1 addition & 0 deletions chrome/browser/android/vr/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import("//chrome/android/modules/buildflags.gni")
import("//chrome/common/features.gni")
import("//device/vr/buildflags/buildflags.gni")
import("//testing/test.gni")
import("//third_party/jni_zero/jni_zero.gni")

assert(enable_vr)

Expand Down
1 change: 1 addition & 0 deletions chrome/browser/autofill/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

java_cpp_enum("autofill_generated_enums") {
sources = [
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/autofill/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("test_java") {
testonly = true
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/banners/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
srcjar_deps = [ ":jni_headers" ]
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/battery/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

generate_jni("jni_headers") {
sources = [
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/bluetooth/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
srcjar_deps = [ ":jni_headers" ]
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/commerce/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
srcjar_deps = [ ":shopping_service_jni" ]
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/commerce/merchant_viewer/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
srcjar_deps = [ ":jni_headers" ]
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/commerce/price_tracking/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

generate_jni("jni_headers") {
sources = [ "java/src/org/chromium/chrome/browser/price_tracking/PriceTrackingNotificationBridge.java" ]
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/consent_auditor/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

generate_jni("jni_headers") {
sources = [ "java/src/org/chromium/chrome/browser/consent_auditor/ConsentAuditorBridge.java" ]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
visibility = [
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/contextmenu/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//chrome/browser/buildflags.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
sources = [
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/device_reauth/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
deps = [
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/download/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import("//build/config/android/rules.gni")
import("//chrome/android/features/android_library_factory_tmpl.gni")
import("//third_party/jni_zero/jni_zero.gni")

# Minimal Java library for the DownloadFileProvider which will be included in
# the base module.
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/download/internal/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
srcjar_deps = [ ":jni_headers" ]
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/endpoint_fetcher/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
deps = [
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/enterprise/util/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

_jni_sources = [
"android/java/src/org/chromium/chrome/browser/enterprise/util/EnterpriseInfo.java",
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/feature_engagement/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
srcjar_deps = [ ":jni_headers" ]
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/feed/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import("//build/config/android/config.gni")
import("//build/config/android/rules.gni")
import("//chrome/android/features/android_library_factory_tmpl.gni")
import("//chrome/browser/buildflags.gni")
import("//third_party/jni_zero/jni_zero.gni")

android_library("java") {
srcjar_deps = [ ":jni_headers" ]
Expand Down
1 change: 1 addition & 0 deletions chrome/browser/feedback/android/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
# found in the LICENSE file.

import("//build/config/android/rules.gni")
import("//third_party/jni_zero/jni_zero.gni")

generate_jni("jni_headers") {
sources = [
Expand Down
Loading

0 comments on commit 2cb3f6d

Please sign in to comment.