jni_zero: Renaming JNI export macros and deleting use of BASE

Sam Maier (Gerrit)

unread,

Oct 18, 2023, 2:30:51 PM10/18/23

to Andrew Grieve, agriev...@chromium.org, feature-v...@chromium.org, halliwe...@chromium.org, lcwu+...@chromium.org, lizeb...@chromium.org, nyquis...@chromium.org, pasko...@chromium.org, torne...@chromium.org, wittma...@chromium.org, yfriedm...@chromium.org

Attention is currently required from: Andrew Grieve.

Sam Maier would like Andrew Grieve to review this change.

View Change

jni_zero: Renaming JNI export macros and deleting use of BASE_EXPORT

These 2 different export macros were confusingly named, so I renamed
them to more closely describe what they are intended to.

Also, I've broken the dep onto BASE_EXPORT.

Bug: 1377351
Change-Id: I59881bdbc10e4931a32a48b64ce2984cfd70136c
---
M base/android/linker/DEPS
M base/android/linker/linker_jni.cc
M base/android/linker/linker_jni.h
M chrome/android/modules/cablev2_authenticator/internal/entrypoints.cc
M chrome/android/modules/stack_unwinder/internal/entrypoints.cc
M chrome/android/modules/test_dummy/internal/entrypoints.cc
M chrome/browser/vr/jni_onload.cc
M chromecast/app/android/cast_browser_module_entrypoint.cc
M docs/android_dynamic_feature_modules.md
M third_party/gvr-android-sdk/gvr_api_jni.h
M third_party/gvr-android-sdk/native_callbacks_jni.h
M third_party/jni_zero/BUILD.gn
M third_party/jni_zero/golden/testBidirectionalClass-SampleForTests_jni.h.golden
M third_party/jni_zero/golden/testBirectionalNonProxy-SampleBidirectionalNonProxy_jni.h.golden
M third_party/jni_zero/golden/testEndToEndManualRegistration-Registration.h.golden
M third_party/jni_zero/golden/testEndToEndManualRegistration_NonProxy-Registration.h.golden
M third_party/jni_zero/golden/testEndToEndProxyHashed-Registration.h.golden
M third_party/jni_zero/golden/testEndToEndProxyJniWithModules-Registration.h.golden
M third_party/jni_zero/golden/testEndToEndProxyJniWithModules-SampleModule_jni.h.golden
M third_party/jni_zero/golden/testForTestingKept-Registration.h.golden
M third_party/jni_zero/golden/testForTestingKept-SampleProxyEdgeCases_jni.h.golden
M third_party/jni_zero/golden/testForTestingRemoved-Registration.h.golden
M third_party/jni_zero/golden/testFromClassFile-JavapClass_jni.h.golden
M third_party/jni_zero/golden/testMultiplexing-Registration.h.golden
M third_party/jni_zero/golden/testNonProxy-SampleNonProxy_jni.h.golden
M third_party/jni_zero/golden/testPackagePrefixGenerator-SampleForTests_jni.h.golden
M third_party/jni_zero/golden/testPackagePrefixWithManualRegistration-Registration.h.golden
M third_party/jni_zero/golden/testPackagePrefixWithManualRegistrationWithProxyHash-Registration.h.golden
M third_party/jni_zero/golden/testPackagePrefixWithProxyHash-Registration.h.golden
M third_party/jni_zero/golden/testUniqueAnnotations-SampleUniqueAnnotations_jni.h.golden
A third_party/jni_zero/jni_export.h
M third_party/jni_zero/jni_generator.py
M third_party/jni_zero/jni_registration_generator.py
M third_party/jni_zero/jni_zero_helper.h
34 files changed, 463 insertions(+), 455 deletions(-)

To view, visit change 4953085. To unsubscribe, or for help writing mail filters, visit settings.

Sam Maier (Gerrit)

unread,

Oct 18, 2023, 2:30:56 PM10/18/23

to agriev...@chromium.org, feature-v...@chromium.org, halliwe...@chromium.org, lcwu+...@chromium.org, lizeb...@chromium.org, nyquis...@chromium.org, pasko...@chromium.org, torne...@chromium.org, wittma...@chromium.org, yfriedm...@chromium.org, Andrew Grieve, Charlie Hu, chromium...@chromium.org

Attention is currently required from: Andrew Grieve.

Patch set 1:Commit-Queue +1

View Change

To view, visit change 4953085. To unsubscribe, or for help writing mail filters, visit settings.

Sam Maier (Gerrit)

unread,

Oct 18, 2023, 3:01:19 PM10/18/23

to agriev...@chromium.org, feature-v...@chromium.org, halliwe...@chromium.org, lcwu+...@chromium.org, lizeb...@chromium.org, nyquis...@chromium.org, pasko...@chromium.org, torne...@chromium.org, wittma...@chromium.org, yfriedm...@chromium.org

Attention is currently required from: Andrew Grieve, Sam Maier.

Sam Maier uploaded patch set #2 to this change.

View Change

jni_zero: Renaming JNI export macros and deleting use of BASE_EXPORT

These 2 different export macros were confusingly named, so I renamed
them to more closely describe what they are intended to.

Also, I've broken the dep onto BASE_EXPORT.

Bug: 1377351
Change-Id: I59881bdbc10e4931a32a48b64ce2984cfd70136c
---

M base/BUILD.gn
M base/android/linker/BUILD.gn


M base/android/linker/DEPS
M base/android/linker/linker_jni.cc
M base/android/linker/linker_jni.h

M chrome/android/modules/cablev2_authenticator/internal/BUILD.gn
M chrome/android/modules/cablev2_authenticator/internal/entrypoints.cc
M chrome/android/modules/stack_unwinder/internal/BUILD.gn
M chrome/android/modules/stack_unwinder/internal/entrypoints.cc
M chrome/android/modules/test_dummy/internal/BUILD.gn

39 files changed, 473 insertions(+), 457 deletions(-)

To view, visit change 4953085. To unsubscribe, or for help writing mail filters, visit settings.

Sam Maier (Gerrit)

unread,

Oct 18, 2023, 3:07:30 PM10/18/23

to agriev...@chromium.org, feature-v...@chromium.org, halliwe...@chromium.org, lcwu+...@chromium.org, lizeb...@chromium.org, nyquis...@chromium.org, pasko...@chromium.org, torne...@chromium.org, wittma...@chromium.org, yfriedm...@chromium.org

Attention is currently required from: Andrew Grieve, Sam Maier.

Sam Maier uploaded patch set #3 to this change.

View Change

39 files changed, 475 insertions(+), 457 deletions(-)

To view, visit change 4953085. To unsubscribe, or for help writing mail filters, visit settings.

Andrew Grieve (Gerrit)

unread,

Oct 18, 2023, 3:14:13 PM10/18/23

to Sam Maier, agriev...@chromium.org, feature-v...@chromium.org, halliwe...@chromium.org, lcwu+...@chromium.org, lizeb...@chromium.org, nyquis...@chromium.org, pasko...@chromium.org, torne...@chromium.org, wittma...@chromium.org, yfriedm...@chromium.org, Chromium LUCI CQ, Andrew Grieve, Charlie Hu, chromium...@chromium.org

View Change

2 comments:

File third_party/jni_zero/BUILD.gn:
- Patch Set #2, Line 11: source_set("jni_helpers") {
  Love the new macro names, but this name isn't so great.
  WDYT about just calling this "jni_zero"?
- Patch Set #2, Line 18: deps = [ "//base" ]
  this needs to be `public_deps` I think (since it's headers that require it and not just .cc files)

To view, visit change 4953085. To unsubscribe, or for help writing mail filters, visit settings.

Sam Maier (Gerrit)

unread,

Oct 18, 2023, 3:35:25 PM10/18/23

to agriev...@chromium.org, feature-v...@chromium.org, halliwe...@chromium.org, lcwu+...@chromium.org, lizeb...@chromium.org, nyquis...@chromium.org, pasko...@chromium.org, torne...@chromium.org, wittma...@chromium.org, yfriedm...@chromium.org

Attention is currently required from: Sam Maier.

Sam Maier uploaded patch set #4 to this change.

View Change

jni_zero: Renaming JNI export macros and deleting use of BASE_EXPORT

These 2 different export macros were confusingly named, so I renamed
them to more closely describe what they are intended to.

Also, I've broken the dep onto BASE_EXPORT.

Bug: 1377351
Change-Id: I59881bdbc10e4931a32a48b64ce2984cfd70136c
---
M base/BUILD.gn
M base/android/linker/BUILD.gn
M base/android/linker/DEPS
M base/android/linker/linker_jni.cc
M base/android/linker/linker_jni.h
M chrome/android/modules/cablev2_authenticator/internal/BUILD.gn
M chrome/android/modules/cablev2_authenticator/internal/entrypoints.cc
M chrome/android/modules/stack_unwinder/internal/BUILD.gn
M chrome/android/modules/stack_unwinder/internal/entrypoints.cc
M chrome/android/modules/test_dummy/internal/BUILD.gn
M chrome/android/modules/test_dummy/internal/entrypoints.cc

M chrome/browser/ui/BUILD.gn
M chrome/browser/vr/jni_onload.cc
M chromecast/app/android/cast_browser_module_entrypoint.cc
M components/permissions/BUILD.gn
M content/browser/BUILD.gn
M docs/android_dynamic_feature_modules.md
M third_party/cardboard/BUILD.gn

43 files changed, 480 insertions(+), 462 deletions(-)

To view, visit change 4953085. To unsubscribe, or for help writing mail filters, visit settings.

Sam Maier (Gerrit)

unread,

Oct 18, 2023, 3:37:26 PM10/18/23

to agriev...@chromium.org, feature-v...@chromium.org, halliwe...@chromium.org, lcwu+...@chromium.org, lizeb...@chromium.org, nyquis...@chromium.org, pasko...@chromium.org, torne...@chromium.org, wittma...@chromium.org, yfriedm...@chromium.org, Chromium LUCI CQ, Andrew Grieve, Charlie Hu, chromium...@chromium.org

Attention is currently required from: Andrew Grieve.

Patch set 4:Auto-Submit +1Commit-Queue +1

View Change

2 comments:

File third_party/jni_zero/BUILD.gn:

- Patch Set #2, Line 11: source_set("jni_helpers") {

- Love the new macro names, but this name isn't so great. […]
  Done

- Patch Set #2, Line 18: deps = [ "//base" ]

- this needs to be `public_deps` I think (since it's headers that require it and not just . […]
  Done

To view, visit change 4953085. To unsubscribe, or for help writing mail filters, visit settings.

Sam Maier (Gerrit)

unread,

Oct 18, 2023, 4:44:17 PM10/18/23

to agriev...@chromium.org, feature-v...@chromium.org, halliwe...@chromium.org, lcwu+...@chromium.org, lizeb...@chromium.org, nyquis...@chromium.org, pasko...@chromium.org, torne...@chromium.org, wittma...@chromium.org, yfriedm...@chromium.org

Attention is currently required from: Andrew Grieve, Sam Maier.

Sam Maier uploaded patch set #5 to this change.

View Change

jni_zero: Renaming JNI export macros and deleting use of BASE_EXPORT

These 2 different export macros were confusingly named, so I renamed
them to more closely describe what they are intended to.

Also, I've broken the dep onto BASE_EXPORT.

Bug: 1377351
Change-Id: I59881bdbc10e4931a32a48b64ce2984cfd70136c
---
M base/BUILD.gn
M base/android/linker/BUILD.gn
M base/android/linker/DEPS
M base/android/linker/linker_jni.cc
M base/android/linker/linker_jni.h
M chrome/android/modules/cablev2_authenticator/internal/BUILD.gn
M chrome/android/modules/cablev2_authenticator/internal/entrypoints.cc
M chrome/android/modules/stack_unwinder/internal/BUILD.gn
M chrome/android/modules/stack_unwinder/internal/entrypoints.cc
M chrome/android/modules/test_dummy/internal/BUILD.gn
M chrome/android/modules/test_dummy/internal/entrypoints.cc
M chrome/browser/ui/BUILD.gn

M chrome/browser/vr/BUILD.gn
M chrome/browser/vr/jni_onload.cc
M chromecast/android/BUILD.gn

45 files changed, 482 insertions(+), 462 deletions(-)

To view, visit change 4953085. To unsubscribe, or for help writing mail filters, visit settings.

Andrew Grieve (Gerrit)

unread,

Oct 18, 2023, 4:45:48 PM10/18/23

to Sam Maier, agriev...@chromium.org, feature-v...@chromium.org, halliwe...@chromium.org, lcwu+...@chromium.org, lizeb...@chromium.org, nyquis...@chromium.org, pasko...@chromium.org, torne...@chromium.org, wittma...@chromium.org, yfriedm...@chromium.org, Andrew Grieve, Chromium LUCI CQ, Charlie Hu, chromium...@chromium.org

Attention is currently required from: Sam Maier.

Patch set 5:Owners-Override +1Code-Review +1Commit-Queue +2

View Change

To view, visit change 4953085. To unsubscribe, or for help writing mail filters, visit settings.

Sam Maier (Gerrit)

unread,

Oct 19, 2023, 9:55:07 AM10/19/23

to agriev...@chromium.org, feature-v...@chromium.org, halliwe...@chromium.org, lcwu+...@chromium.org, lizeb...@chromium.org, nyquis...@chromium.org, pasko...@chromium.org, torne...@chromium.org, wittma...@chromium.org, yfriedm...@chromium.org

Attention is currently required from: Andrew Grieve, Sam Maier.

Sam Maier uploaded patch set #6 to this change.

View Change

45 files changed, 488 insertions(+), 462 deletions(-)

To view, visit change 4953085. To unsubscribe, or for help writing mail filters, visit settings.

Sam Maier (Gerrit)

unread,

Oct 19, 2023, 9:55:45 AM10/19/23

to agriev...@chromium.org, feature-v...@chromium.org, halliwe...@chromium.org, lcwu+...@chromium.org, lizeb...@chromium.org, nyquis...@chromium.org, pasko...@chromium.org, torne...@chromium.org, wittma...@chromium.org, yfriedm...@chromium.org, Andrew Grieve, Chromium LUCI CQ, Charlie Hu, chromium...@chromium.org

Attention is currently required from: Andrew Grieve.

Patch set 6:Auto-Submit +1Owners-Override +1Commit-Queue +1

View Change

To view, visit change 4953085. To unsubscribe, or for help writing mail filters, visit settings.

Sam Maier (Gerrit)

unread,

Oct 19, 2023, 11:01:59 AM10/19/23

to agriev...@chromium.org, feature-v...@chromium.org, halliwe...@chromium.org, lcwu+...@chromium.org, lizeb...@chromium.org, nyquis...@chromium.org, pasko...@chromium.org, torne...@chromium.org, wittma...@chromium.org, yfriedm...@chromium.org, Andrew Grieve, Chromium LUCI CQ, Charlie Hu, chromium...@chromium.org

Attention is currently required from: Andrew Grieve.

Patch set 6:Commit-Queue +2

View Change

To view, visit change 4953085. To unsubscribe, or for help writing mail filters, visit settings.

Chromium LUCI CQ (Gerrit)

unread,

Oct 19, 2023, 1:05:05 PM10/19/23

to Sam Maier, agriev...@chromium.org, feature-v...@chromium.org, halliwe...@chromium.org, lcwu+...@chromium.org, lizeb...@chromium.org, nyquis...@chromium.org, pasko...@chromium.org, torne...@chromium.org, wittma...@chromium.org, yfriedm...@chromium.org, Andrew Grieve, Charlie Hu, chromium...@chromium.org

Chromium LUCI CQ submitted this change.

View Change



5 is the latest approved patch-set.
The change was submitted with unreviewed changes in the following files:

```
The name of the file: base/android/linker/BUILD.gn
Insertions: 1, Deletions: 1.

@@ -17,7 +17,7 @@
 
   deps = [
     "//build:buildflag_header_h",
-    "//third_party/jni_zero",
+    "//third_party/jni_zero:jni_export",
   ]
 
   # Export JNI symbols.
```
```
The name of the file: third_party/jni_zero/BUILD.gn
Insertions: 8, Deletions: 2.

@@ -8,14 +8,20 @@
   include_dirs = [ jni_headers_dir ]
 }
 
+source_set("jni_export") {
+  sources = [ "jni_export.h" ]
+}
+
 source_set("jni_zero") {
   sources = [
-    "jni_export.h",
     "jni_int_wrapper.h",
     "jni_zero_helper.h",
   ]
 
-  public_deps = [ "//base" ]
+  public_deps = [
+    ":jni_export",
+    "//base",
+  ]
 }
 
 if (enable_java_templates && is_android) {
```

Approvals:
  Sam Maier: Send CL to CQ automatically after approval; Commit; Looks good to me
  Andrew Grieve: Looks good to me; Looks good to me

jni_zero: Renaming JNI export macros and deleting use of BASE_EXPORT

These 2 different export macros were confusingly named, so I renamed
them to more closely describe what they are intended to.

Also, I've broken the dep onto BASE_EXPORT.

Bug: 1377351
Change-Id: I59881bdbc10e4931a32a48b64ce2984cfd70136c

Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4953085
Reviewed-by: Andrew Grieve <agr...@chromium.org>
Auto-Submit: Sam Maier <sma...@chromium.org>
Owners-Override: Andrew Grieve <agr...@chromium.org>
Owners-Override: Sam Maier <sma...@chromium.org>
Commit-Queue: Sam Maier <sma...@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1212226}

To view, visit change 4953085. To unsubscribe, or for help writing mail filters, visit settings.

Reply all

Reply to author

Forward

jni_zero: Renaming JNI export macros and deleting use of BASE_EXPORT [chromium/src : main]

Sam Maier (Gerrit)

Sam Maier (Gerrit)

Sam Maier (Gerrit)

Sam Maier (Gerrit)

Andrew Grieve (Gerrit)

Sam Maier (Gerrit)

Sam Maier (Gerrit)

Sam Maier (Gerrit)

Andrew Grieve (Gerrit)

Sam Maier (Gerrit)

Sam Maier (Gerrit)

Sam Maier (Gerrit)

Chromium LUCI CQ (Gerrit)