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 <agrieve@chromium.org>
Auto-Submit: Sam Maier <smaier@chromium.org>
Owners-Override: Andrew Grieve <agrieve@chromium.org>
Owners-Override: Sam Maier <smaier@chromium.org>
Commit-Queue: Sam Maier <smaier@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1212226}

base/BUILD.gn

@@ -1340,7 +1340,6 @@ component("base") {
     deps += [
       ":base_jni",
       ":process_launcher_jni",
-      "//third_party/jni_zero:jni_helpers",
     ]
   }  # is_android || is_robolectric
 
@@ -3725,6 +3724,7 @@ test("base_unittests") {
     deps += [
       ":base_java_unittest_support",
       "//base/test:test_support_java",
+      "//third_party/jni_zero",
     ]
   }
 

base/android/linker/BUILD.gn

@@ -15,7 +15,10 @@ shared_library("chromium_android_linker") {
     "linker_minimal_libcxx.cc",
   ]
 
-  deps = [ "//build:buildflag_header_h" ]
+  deps = [
+    "//build:buildflag_header_h",
+    "//third_party/jni_zero:jni_export",
+  ]
 
   # Export JNI symbols.
   configs -= [ "//build/config/android:hide_all_but_jni_onload" ]

base/android/linker/DEPS

@@ -3,6 +3,7 @@ include_rules = [
   # directory.
   "-base",
   "+base/android/linker",
+  "+third_party/jni_zero/jni_export.h",
 ]
 
 # Allow using //base in unittests. These unittests are included in targets that

base/android/linker/linker_jni.cc

@@ -710,7 +710,7 @@ bool NativeLibInfo::SharedMemoryFunctionsSupportedForTesting() {
   return functions.IsWorking();
 }
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_org_chromium_base_library_1loader_LinkerJni_nativeFindMemoryRegionAtRandomAddress(
     JNIEnv* env,
     jclass clazz,
@@ -722,7 +722,7 @@ Java_org_chromium_base_library_1loader_LinkerJni_nativeFindMemoryRegionAtRandomA
   s_lib_info_fields.SetLoadInfo(env, lib_info_obj, address, size);
 }
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_org_chromium_base_library_1loader_LinkerJni_nativeReserveMemoryForLibrary(
     JNIEnv* env,
     jclass clazz,
@@ -735,7 +735,7 @@ Java_org_chromium_base_library_1loader_LinkerJni_nativeReserveMemoryForLibrary(
   s_lib_info_fields.SetLoadInfo(env, lib_info_obj, address, size);
 }
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
 Java_org_chromium_base_library_1loader_LinkerJni_nativeFindRegionReservedByWebViewZygote(
     JNIEnv* env,
     jclass clazz,
@@ -749,7 +749,7 @@ Java_org_chromium_base_library_1loader_LinkerJni_nativeFindRegionReservedByWebVi
   return true;
 }
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
 Java_org_chromium_base_library_1loader_LinkerJni_nativeLoadLibrary(
     JNIEnv* env,
     jclass clazz,
@@ -770,7 +770,7 @@ Java_org_chromium_base_library_1loader_LinkerJni_nativeLoadLibrary(
   return true;
 }
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
 Java_org_chromium_base_library_1loader_LinkerJni_nativeUseRelros(
     JNIEnv* env,
     jclass clazz,
@@ -796,7 +796,7 @@ Java_org_chromium_base_library_1loader_LinkerJni_nativeUseRelros(
   return true;
 }
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_org_chromium_base_library_1loader_LinkerJni_nativeGetRelroSharingResult(
     JNIEnv* env,
     jclass clazz) {

base/android/linker/linker_jni.h

@@ -22,6 +22,7 @@
 #include <stdlib.h>
 
 #include "build/build_config.h"
+#include "third_party/jni_zero/jni_export.h"
 
 // Set this to 1 to enable debug traces to the Android log.
 // Note that LOG() from "base/logging.h" cannot be used, since it is
@@ -43,16 +44,6 @@
 #define PLOG_ERROR(FORMAT, ...) \
   LOG_ERROR(FORMAT ": %s", ##__VA_ARGS__, strerror(errno))
 
-#if defined(ARCH_CPU_X86)
-// Dalvik JIT generated code doesn't guarantee 16-byte stack alignment on
-// x86 - use force_align_arg_pointer to realign the stack at the JNI
-// boundary. https://crbug.com/655248
-#define JNI_GENERATOR_EXPORT \
-  extern "C" __attribute__((visibility("default"), force_align_arg_pointer))
-#else
-#define JNI_GENERATOR_EXPORT extern "C" __attribute__((visibility("default")))
-#endif
-
 #if defined(__arm__) && defined(__ARM_ARCH_7A__)
 #define CURRENT_ABI "armeabi-v7a"
 #elif defined(__arm__)

chrome/android/modules/cablev2_authenticator/internal/BUILD.gn

@@ -30,6 +30,7 @@ component_with_jni("cablev2_authenticator") {
   deps = [
     "//base",
     "//chrome/android/features/cablev2_authenticator:native",
+    "//third_party/jni_zero",
   ]
 
   # caBLE v2 authenticator native entrypoints belong in the partition.

chrome/android/modules/cablev2_authenticator/internal/entrypoints.cc

@@ -8,7 +8,7 @@
 
 extern "C" {
 // This JNI registration method is found and called by module framework code.
-JNI_GENERATOR_EXPORT bool JNI_OnLoad_cablev2_authenticator(JNIEnv* env) {
+JNI_BOUNDARY_EXPORT bool JNI_OnLoad_cablev2_authenticator(JNIEnv* env) {
   if (!cablev2_authenticator::RegisterNatives(env)) {
     return false;
   }

chrome/android/modules/stack_unwinder/internal/BUILD.gn

@@ -40,6 +40,7 @@ component_with_jni("stack_unwinder") {
     "//base",
     "//base:native_unwinder_android",
     "//chrome/android/features/stack_unwinder/public:native",
+    "//third_party/jni_zero",
   ]
 
   # stack unwinder native entrypoints belong in the partition.

chrome/android/modules/stack_unwinder/internal/entrypoints.cc

@@ -9,7 +9,7 @@
 extern "C" {
 // This JNI registration method is found and called by module framework
 // code.
-JNI_GENERATOR_EXPORT bool JNI_OnLoad_stack_unwinder(JNIEnv* env) {
+JNI_BOUNDARY_EXPORT bool JNI_OnLoad_stack_unwinder(JNIEnv* env) {
   if (!stack_unwinder::RegisterNatives(env)) {
     return false;
   }

chrome/android/modules/test_dummy/internal/BUILD.gn

@@ -29,6 +29,7 @@ component_with_jni("test_dummy") {
   deps = [
     "//base",
     "//chrome/browser/test_dummy/internal:native",
+    "//third_party/jni_zero",
   ]
 
   # Test dummy native entrypoints belong in the partition.

chrome/android/modules/test_dummy/internal/entrypoints.cc

@@ -8,7 +8,7 @@
 
 extern "C" {
 // This JNI registration method is found and called by module framework code.
-JNI_GENERATOR_EXPORT bool JNI_OnLoad_test_dummy(JNIEnv* env) {
+JNI_BOUNDARY_EXPORT bool JNI_OnLoad_test_dummy(JNIEnv* env) {
   if (!test_dummy::RegisterNatives(env)) {
     return false;
   }

chrome/browser/ui/BUILD.gn

@@ -1001,7 +1001,7 @@ static_library("ui") {
       "//device/vr/buildflags",
       "//services/device/public/cpp/usb",
       "//services/device/public/mojom:usb",
-      "//third_party/jni_zero:jni_helpers",
+      "//third_party/jni_zero",
       "//ui/android",
       "//url",
     ]

chrome/browser/vr/BUILD.gn

@@ -122,6 +122,7 @@ component("vr_ui") {
 
   if (is_android) {
     sources += [ "jni_onload.cc" ]
+    deps += [ "//third_party/jni_zero" ]
   }
 
   if (use_command_buffer) {

chrome/browser/vr/jni_onload.cc

@@ -8,6 +8,6 @@
 // register VR's native JNI methods. However, since VR's Android-specific native
 // code still lives in the base module, VR's JNI registration is invoked
 // manually. Therefore, this function does nothing.
-JNI_GENERATOR_EXPORT bool JNI_OnLoad_vr(JNIEnv* env) {
+JNI_BOUNDARY_EXPORT bool JNI_OnLoad_vr(JNIEnv* env) {
   return true;
 }

chromecast/android/BUILD.gn

@@ -93,6 +93,7 @@ component("cast_browser") {
   deps = [
     ":common_apk_deps",
     "//chromecast:cast_shell_lib_simple",
+    "//third_party/jni_zero",
   ]
 
   cflags = [ "-fsymbol-partition=cast_browser_partition" ]

chromecast/app/android/cast_browser_module_entrypoint.cc

@@ -10,7 +10,7 @@
 
 extern "C" {
 // This JNI registration method is found and called by module framework code.
-JNI_GENERATOR_EXPORT bool JNI_OnLoad_cast_browser(JNIEnv* env) {
+JNI_BOUNDARY_EXPORT bool JNI_OnLoad_cast_browser(JNIEnv* env) {
   content::Compositor::Initialize();
   content::SetContentMainDelegate(new chromecast::shell::CastMainDelegate);
   return true;

components/permissions/BUILD.gn

@@ -184,7 +184,7 @@ source_set("permissions") {
       "//components/prefs",
       "//components/resources:android_resources",
       "//components/security_state/core:core",
-      "//third_party/jni_zero:jni_helpers",
+      "//third_party/jni_zero",
       "//ui/android",
       "//ui/strings:ui_strings_grit",
     ]

content/browser/BUILD.gn

@@ -3251,7 +3251,7 @@ source_set("browser") {
       "//third_party/blink/public/common:font_unique_name_table_proto",
       "//third_party/blink/public/mojom:mojom_platform_blink",
       "//third_party/icu",
-      "//third_party/jni_zero:jni_helpers",
+      "//third_party/jni_zero",
       "//ui/accessibility:ax_assistant",
       "//ui/accessibility:ax_base_android",
       "//ui/accessibility/mojom",

docs/android_dynamic_feature_modules.md

@@ -459,7 +459,7 @@ on all Chrome build variants, including Monochrome (unlike base module JNI).
 
 extern "C" {
 // This JNI registration method is found and called by module framework code.
-JNI_GENERATOR_EXPORT bool JNI_OnLoad_foo(JNIEnv* env) {
+JNI_BOUNDARY_EXPORT bool JNI_OnLoad_foo(JNIEnv* env) {
   if (!foo::RegisterNatives(env)) {
     return false;
   }

third_party/cardboard/BUILD.gn

@@ -144,7 +144,7 @@ static_library("cardboard") {
 
   deps = [
     "//base",
-    "//third_party/jni_zero:jni_helpers",
+    "//third_party/jni_zero",
     "//ui/gl",
   ]
 

third_party/gvr-android-sdk/gvr_api_jni.h

@@ -43,25 +43,25 @@ std::atomic<jclass> g_GvrApi_clazz __attribute__((unused)) (nullptr);
 namespace GvrApi {
 // Step 2: method stubs.
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportListCreate(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportListDestroy(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewportList);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportListGetSize(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewportList);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportListGetItem(
     JNIEnv* env,
     jclass jcaller,
@@ -69,7 +69,7 @@ Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportListGetItem(
     jint index,
     jlong nativeBufferViewport);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportListSetItem(
     JNIEnv* env,
     jclass jcaller,
@@ -77,26 +77,26 @@ Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportListSetItem(
     jint index,
     jlong nativeBufferViewport);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportCreate(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportDestroy(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportGetSourceUv(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport,
     jobject out);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportSetSourceUv(
     JNIEnv* env,
     jclass jcaller,
@@ -106,14 +106,14 @@ Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportSetSourceUv(
     jfloat right,
     jfloat bottom);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportGetSourceFov(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport,
     jobject out);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportSetSourceFov(
     JNIEnv* env,
     jclass jcaller,
@@ -123,112 +123,112 @@ Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportSetSourceFov(
     jfloat right,
     jfloat bottom);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportGetTransform(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport,
     jfloatArray matrix);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportSetTransform(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport,
     jfloatArray matrix);
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportEqual(JNIEnv* env,
                                                              jclass jcaller,
                                                              jlong nativeA,
                                                              jlong nativeB);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportGetTargetEye(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportSetTargetEye(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport,
     jint eye);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportGetSourceBufferIndex(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportSetSourceBufferIndex(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport,
     jint index);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportGetExternalSurfaceId(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportSetExternalSurfaceId(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport,
     jint id);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportSetExternalSurface(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport,
     jlong nativeExternalSurface);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportGetReprojection(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportSetReprojection(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport,
     jint reprojection);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferViewportSetSourceLayer(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferViewport,
     jint layerIndex);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferSpecCreate(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferSpecDestroy(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferSpec);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferSpecGetSize(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferSpec,
     jobject size);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferSpecSetSize(
     JNIEnv* env,
     jclass jcaller,
@@ -236,41 +236,41 @@ Java_com_google_vr_ndk_base_GvrApi_nativeBufferSpecSetSize(
     jint width,
     jint height);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferSpecSetColorFormat(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferSpec,
     jint format);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferSpecSetDepthStencilFormat(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferSpec,
     jint format);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferSpecSetMultiviewLayers(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferSpec,
     jint numLayers);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferSpecGetSamples(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferSpec);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeBufferSpecSetSamples(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferSpec,
     jint samples);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeExternalSurfaceCreateWithListeners(
     JNIEnv* env,
     jclass jcaller,
@@ -279,42 +279,42 @@ Java_com_google_vr_ndk_base_GvrApi_nativeExternalSurfaceCreateWithListeners(
     jobject frameListener,
     jobject handler);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeExternalSurfaceDestroy(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferSpec);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeExternalSurfaceGetId(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferSpec);
 
-JNI_GENERATOR_EXPORT jobject
+JNI_BOUNDARY_EXPORT jobject
 Java_com_google_vr_ndk_base_GvrApi_nativeExternalSurfaceGetSurface(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeBufferSpec);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeSwapChainCreate(JNIEnv* env,
                                                          jclass jcaller,
                                                          jlong nativeContext,
                                                          jlongArray specs);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeSwapChainDestroy(JNIEnv* env,
                                                           jclass jcaller,
                                                           jlong nativeContext);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeSwapChainGetBufferCount(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeSwapChain);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeSwapChainGetBufferSize(
     JNIEnv* env,
     jclass jcaller,
@@ -322,7 +322,7 @@ Java_com_google_vr_ndk_base_GvrApi_nativeSwapChainGetBufferSize(
     jint bufferIndex,
     jobject size);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeSwapChainResizeBuffer(
     JNIEnv* env,
     jclass jcaller,
@@ -331,65 +331,65 @@ Java_com_google_vr_ndk_base_GvrApi_nativeSwapChainResizeBuffer(
     jint width,
     jint height);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeSwapChainAcquireFrame(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeSwapChain);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeFrameBindBuffer(JNIEnv* env,
                                                          jclass jcaller,
                                                          jlong nativeFrame,
                                                          jint bufferIndex);
 
-JNI_GENERATOR_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeFrameUnbind(
+JNI_BOUNDARY_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeFrameUnbind(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeFrame);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeFrameGetFramebufferObject(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeFrame,
     jint bufferIndex);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeFrameGetBufferSize(JNIEnv* env,
                                                             jclass jcaller,
                                                             jlong nativeFrame,
                                                             jint bufferIndex,
                                                             jobject size);
 
-JNI_GENERATOR_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeFrameSubmit(
+JNI_BOUNDARY_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeFrameSubmit(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeFrame,
     jlong nativeBufferViewportList,
     jfloatArray headSpaceFromStartSpace);
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
 Java_com_google_vr_ndk_base_GvrApi_nativeUsingDynamicLibrary(JNIEnv* env,
                                                              jclass jcaller);
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
 Java_com_google_vr_ndk_base_GvrApi_nativeUsingShimLibrary(JNIEnv* env,
                                                           jclass jcaller);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeSetApplicationState(JNIEnv* env,
                                                              jclass jcaller,
                                                              jclass classLoader,
                                                              jobject context);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeSetDynamicLibraryLoadingEnabled(
     JNIEnv* env,
     jclass jcaller,
     jboolean enabled);
 
-JNI_GENERATOR_EXPORT jlong Java_com_google_vr_ndk_base_GvrApi_nativeCreate(
+JNI_BOUNDARY_EXPORT jlong Java_com_google_vr_ndk_base_GvrApi_nativeCreate(
     JNIEnv* env,
     jobject jcaller,
     jclass classLoader,
@@ -401,101 +401,101 @@ JNI_GENERATOR_EXPORT jlong Java_com_google_vr_ndk_base_GvrApi_nativeCreate(
     jfloat yDpi,
     jobject optionalPoseTrackingForTesting);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeRequestContextSharing(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext,
     jobject eglListener);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeGetError(JNIEnv* env,
                                                   jobject jcaller,
                                                   jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeClearError(JNIEnv* env,
                                                     jobject jcaller,
                                                     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT jstring
+JNI_BOUNDARY_EXPORT jstring
 Java_com_google_vr_ndk_base_GvrApi_nativeGetErrorString(JNIEnv* env,
                                                         jclass jcaller,
                                                         jint errorCode);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeGetUserPrefs(JNIEnv* env,
                                                       jobject jcaller,
                                                       jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeUserPrefsGetControllerHandedness(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeUserPrefs);
 
-JNI_GENERATOR_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativePause(
+JNI_BOUNDARY_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativePause(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeResume(
+JNI_BOUNDARY_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeResume(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeReleaseGvrContext(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeInitializeGl(
+JNI_BOUNDARY_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeInitializeGl(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeOnSurfaceCreatedReprojectionThread(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeOnSurfaceChangedReprojectionThread(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeGetRecommendedBufferViewports(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext,
     jlong nativeBufferViewportList);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeGetScreenBufferViewports(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext,
     jlong nativeBufferViewportList);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeGetMaximumEffectiveRenderTargetSize(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext,
     jobject size);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeGetScreenTargetSize(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext,
     jobject size);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeDistortToScreen(
     JNIEnv* env,
     jobject jcaller,
@@ -505,25 +505,25 @@ Java_com_google_vr_ndk_base_GvrApi_nativeDistortToScreen(
     jfloatArray headSpaceFromStartSpace,
     jlong timeNs);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeSetDefaultFramebufferActive(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT jobject
+JNI_BOUNDARY_EXPORT jobject
 Java_com_google_vr_ndk_base_GvrApi_nativeRenderReprojectionThread(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeOnPauseReprojectionThread(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeGetHeadSpaceFromStartSpaceRotation(
     JNIEnv* env,
     jobject jcaller,
@@ -531,7 +531,7 @@ Java_com_google_vr_ndk_base_GvrApi_nativeGetHeadSpaceFromStartSpaceRotation(
     jfloatArray outRotation,
     jlong timeNs);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeGetHeadSpaceFromStartSpaceTransform(
     JNIEnv* env,
     jobject jcaller,
@@ -539,48 +539,48 @@ Java_com_google_vr_ndk_base_GvrApi_nativeGetHeadSpaceFromStartSpaceTransform(
     jfloatArray outTransform,
     jlong timeNs);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeSetIgnoreManualPauseResumeTracker(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext,
     jboolean shouldIgnore);
 
-JNI_GENERATOR_EXPORT void
-Java_com_google_vr_ndk_base_GvrApi_nativePauseTracking(JNIEnv* env,
-                                                       jobject jcaller,
-                                                       jlong nativeGvrContext);
+JNI_BOUNDARY_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativePauseTracking(
+    JNIEnv* env,
+    jobject jcaller,
+    jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT jbyteArray
+JNI_BOUNDARY_EXPORT jbyteArray
 Java_com_google_vr_ndk_base_GvrApi_nativePauseTrackingGetState(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeResumeTracking(JNIEnv* env,
                                                         jobject jcaller,
                                                         jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeResumeTrackingSetState(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext,
     jbyteArray trackerStateBytes);
 
-JNI_GENERATOR_EXPORT void
-Java_com_google_vr_ndk_base_GvrApi_nativeResetTracking(JNIEnv* env,
-                                                       jobject jcaller,
-                                                       jlong nativeGvrContext);
+JNI_BOUNDARY_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeResetTracking(
+    JNIEnv* env,
+    jobject jcaller,
+    jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeRecenterTracking(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeGetEyeFromHeadMatrix(
     JNIEnv* env,
     jobject jcaller,
@@ -588,13 +588,13 @@ Java_com_google_vr_ndk_base_GvrApi_nativeGetEyeFromHeadMatrix(
     jint eye,
     jfloatArray out);
 
-JNI_GENERATOR_EXPORT jintArray
+JNI_BOUNDARY_EXPORT jintArray
 Java_com_google_vr_ndk_base_GvrApi_nativeGetWindowBounds(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT jfloatArray
+JNI_BOUNDARY_EXPORT jfloatArray
 Java_com_google_vr_ndk_base_GvrApi_nativeComputeDistortedPoint(
     JNIEnv* env,
     jobject jcaller,
@@ -602,69 +602,69 @@ Java_com_google_vr_ndk_base_GvrApi_nativeComputeDistortedPoint(
     jint eyeType,
     jfloatArray uvIn);
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
 Java_com_google_vr_ndk_base_GvrApi_nativeSetDefaultViewerProfile(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext,
     jstring viewerProfileUri);
 
-JNI_GENERATOR_EXPORT jstring
+JNI_BOUNDARY_EXPORT jstring
 Java_com_google_vr_ndk_base_GvrApi_nativeGetViewerVendor(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT jstring
+JNI_BOUNDARY_EXPORT jstring
 Java_com_google_vr_ndk_base_GvrApi_nativeGetViewerModel(JNIEnv* env,
                                                         jobject jcaller,
                                                         jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeGetViewerType(JNIEnv* env,
                                                        jobject jcaller,
                                                        jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
 Java_com_google_vr_ndk_base_GvrApi_nativeSetAsyncReprojectionEnabled(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext,
     jboolean enabled);
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
 Java_com_google_vr_ndk_base_GvrApi_nativeGetAsyncReprojectionEnabled(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
 Java_com_google_vr_ndk_base_GvrApi_nativeIsFeatureSupported(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext,
     jint feature);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeReconnectSensors(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeSetIdleListener(JNIEnv* env,
                                                          jobject jcaller,
                                                          jlong nativeGvrContext,
                                                          jobject idleListener);
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
 Java_com_google_vr_ndk_base_GvrApi_nativeSetViewerParams(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext,
     jbyteArray serializedViewerParams);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeSetDisplayMetrics(
     JNIEnv* env,
     jobject jcaller,
@@ -674,13 +674,13 @@ Java_com_google_vr_ndk_base_GvrApi_nativeSetDisplayMetrics(
     jfloat xDpi,
     jfloat yDpi);
 
-JNI_GENERATOR_EXPORT jfloat
+JNI_BOUNDARY_EXPORT jfloat
 Java_com_google_vr_ndk_base_GvrApi_nativeGetBorderSizeMeters(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeSetSurfaceSize(
     JNIEnv* env,
     jobject jcaller,
@@ -688,116 +688,116 @@ Java_com_google_vr_ndk_base_GvrApi_nativeSetSurfaceSize(
     jint surfaceWidthPixels,
     jint surfaceHeightPixels);
 
-JNI_GENERATOR_EXPORT void
-Java_com_google_vr_ndk_base_GvrApi_nativeSetLensOffset(JNIEnv* env,
-                                                       jobject jcaller,
-                                                       jlong nativeGvrContext,
-                                                       jfloat x,
-                                                       jfloat y,
-                                                       jfloat rotation);
+JNI_BOUNDARY_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeSetLensOffset(
+    JNIEnv* env,
+    jobject jcaller,
+    jlong nativeGvrContext,
+    jfloat x,
+    jfloat y,
+    jfloat rotation);
 
-JNI_GENERATOR_EXPORT void
-Java_com_google_vr_ndk_base_GvrApi_nativeDumpDebugData(JNIEnv* env,
-                                                       jobject jcaller,
-                                                       jlong nativeGvrContext);
+JNI_BOUNDARY_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeDumpDebugData(
+    JNIEnv* env,
+    jobject jcaller,
+    jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
 Java_com_google_vr_ndk_base_GvrApi_nativeUsingVrDisplayService(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeGvrContext);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeCreateEvent(JNIEnv* env, jclass clazz);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeCreateValue(JNIEnv* env, jclass clazz);
 
-JNI_GENERATOR_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeDestroyEvent(
+JNI_BOUNDARY_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeDestroyEvent(
     JNIEnv* env,
     jclass clazz,
     jlong native_object);
 
-JNI_GENERATOR_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeDestroyValue(
+JNI_BOUNDARY_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeDestroyValue(
     JNIEnv* env,
     jclass clazz,
     jlong native_object);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeGetCurrentProperties(
     JNIEnv* env,
     jobject object,
     jlong native_object);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeGetEventFlags(JNIEnv* env,
                                                        jclass clazz,
                                                        jlong native_object);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeGetEventTimestamp(JNIEnv* env,
                                                            jclass clazz,
                                                            jlong native_object);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeGetEventType(JNIEnv* env,
                                                       jclass clazz,
                                                       jlong native_object);
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
 Java_com_google_vr_ndk_base_GvrApi_nativeGetProperty(JNIEnv* env,
                                                      jclass clazz,
                                                      jlong native_properties,
                                                      jint property_key,
                                                      jlong native_value);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeGetRecenterEventFlags(
     JNIEnv* env,
     jclass clazz,
     jlong native_object);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_ndk_base_GvrApi_nativeGetRecenterEventStartSpaceFromTrackingSpaceTransform(
     JNIEnv* env,
     jclass clazz,
     jlong native_object,
     jfloatArray rotation_out_array);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeGetRecenterEventType(
     JNIEnv* env,
     jclass clazz,
     jlong native_object);
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
 Java_com_google_vr_ndk_base_GvrApi_nativePollEvent(JNIEnv* env,
                                                    jobject object,
                                                    jlong native_object,
                                                    jlong event_out);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeValueAsFlags(JNIEnv* env,
                                                       jclass clazz,
                                                       jlong native_object);
 
-JNI_GENERATOR_EXPORT jfloat
+JNI_BOUNDARY_EXPORT jfloat
 Java_com_google_vr_ndk_base_GvrApi_nativeValueAsFloat(JNIEnv* env,
                                                       jclass clazz,
                                                       jlong native_object);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
 Java_com_google_vr_ndk_base_GvrApi_nativeValueAsInt(JNIEnv* env,
                                                     jclass clazz,
                                                     jlong native_object);
 
-JNI_GENERATOR_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeValueAsMat4f(
+JNI_BOUNDARY_EXPORT void Java_com_google_vr_ndk_base_GvrApi_nativeValueAsMat4f(
     JNIEnv* env,
     jclass clazz,
     jlong native_object,
     jfloatArray mat4_out_array);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
 Java_com_google_vr_ndk_base_GvrApi_nativeValueGetFlags(JNIEnv* env,
                                                        jclass clazz,
                                                        jlong native_object);

third_party/gvr-android-sdk/native_callbacks_jni.h

@@ -48,7 +48,7 @@ std::atomic<jclass> g_NativeCallbacks_clazz __attribute__((unused)) (nullptr);
 namespace NativeCallbacks {
 // Step 2: method stubs.
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handleStateChanged(
     JNIEnv* env,
     jobject jcaller,
@@ -56,7 +56,7 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleStateChanged(
     jint controllerIndex,
     jint newState);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handleControllerRecentered(
     JNIEnv* env,
     jobject jcaller,
@@ -68,7 +68,7 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleControllerRecentere
     jfloat qz,
     jfloat qw);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handleTouchEvent(
     JNIEnv* env,
     jobject jcaller,
@@ -79,7 +79,7 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleTouchEvent(
     jfloat x,
     jfloat y);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handleOrientationEvent(
     JNIEnv* env,
     jobject jcaller,
@@ -91,7 +91,7 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleOrientationEvent(
     jfloat qz,
     jfloat qw);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handleButtonEvent(
     JNIEnv* env,
     jobject jcaller,
@@ -101,7 +101,7 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleButtonEvent(
     jint buttonCode,
     jboolean down);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handleAccelEvent(
     JNIEnv* env,
     jobject jcaller,
@@ -112,7 +112,7 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleAccelEvent(
     jfloat y,
     jfloat z);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handleGyroEvent(
     JNIEnv* env,
     jobject jcaller,
@@ -123,7 +123,7 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleGyroEvent(
     jfloat y,
     jfloat z);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handlePositionEvent(
     JNIEnv* env,
     jobject jcaller,
@@ -134,7 +134,7 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handlePositionEvent(
     jfloat y,
     jfloat z);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handleBatteryEvent(
     JNIEnv* env,
     jobject jcaller,
@@ -144,33 +144,33 @@ Java_com_google_vr_internal_controller_NativeCallbacks_handleBatteryEvent(
     jboolean isCharging,
     jint batteryLevelBucket);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handleServiceInitFailed(
     JNIEnv* env,
     jobject jcaller,
     jlong userData,
     jint failureReason);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handleServiceFailed(
     JNIEnv* env,
     jobject jcaller,
     jlong userData);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handleServiceUnavailable(
     JNIEnv* env,
     jobject jcaller,
     jlong userData);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handleServiceConnected(
     JNIEnv* env,
     jobject jcaller,
     jlong userData,
     jint flags);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
 Java_com_google_vr_internal_controller_NativeCallbacks_handleServiceDisconnected(
     JNIEnv* env,
     jobject jcaller,

third_party/jni_zero/BUILD.gn

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

third_party/jni_zero/golden/testBidirectionalClass-SampleForTests_jni.h.golden

@@ -18,21 +18,22 @@
 
 // Step 1: Forward declarations.
 
-JNI_REGISTRATION_EXPORT extern const char kClassPath_org_jni_1zero_samples_SampleForTests[];
+JNI_ZERO_COMPONENT_BUILD_EXPORT extern const char kClassPath_org_jni_1zero_samples_SampleForTests[];
 const char kClassPath_org_jni_1zero_samples_SampleForTests[] =
     "org/jni_zero/samples/SampleForTests";
 
-JNI_REGISTRATION_EXPORT extern const char
+JNI_ZERO_COMPONENT_BUILD_EXPORT extern const char
     kClassPath_org_jni_1zero_samples_SampleForTests_00024InnerStructA[];
 const char kClassPath_org_jni_1zero_samples_SampleForTests_00024InnerStructA[] =
     "org/jni_zero/samples/SampleForTests$InnerStructA";
 
-JNI_REGISTRATION_EXPORT extern const char
+JNI_ZERO_COMPONENT_BUILD_EXPORT extern const char
     kClassPath_org_jni_1zero_samples_SampleForTests_00024InnerStructB[];
 const char kClassPath_org_jni_1zero_samples_SampleForTests_00024InnerStructB[] =
     "org/jni_zero/samples/SampleForTests$InnerStructB";
 // Leaking this jclass as we cannot use LazyInstance from some threads.
-JNI_REGISTRATION_EXPORT std::atomic<jclass> g_org_jni_1zero_samples_SampleForTests_clazz(nullptr);
+JNI_ZERO_COMPONENT_BUILD_EXPORT std::atomic<jclass>
+    g_org_jni_1zero_samples_SampleForTests_clazz(nullptr);
 #ifndef org_jni_1zero_samples_SampleForTests_clazz_defined
 #define org_jni_1zero_samples_SampleForTests_clazz_defined
 inline jclass org_jni_1zero_samples_SampleForTests_clazz(JNIEnv* env) {
@@ -41,7 +42,7 @@ inline jclass org_jni_1zero_samples_SampleForTests_clazz(JNIEnv* env) {
 }
 #endif
 // Leaking this jclass as we cannot use LazyInstance from some threads.
-JNI_REGISTRATION_EXPORT std::atomic<jclass>
+JNI_ZERO_COMPONENT_BUILD_EXPORT std::atomic<jclass>
     g_org_jni_1zero_samples_SampleForTests_00024InnerStructA_clazz(nullptr);
 #ifndef org_jni_1zero_samples_SampleForTests_00024InnerStructA_clazz_defined
 #define org_jni_1zero_samples_SampleForTests_00024InnerStructA_clazz_defined
@@ -52,7 +53,7 @@ inline jclass org_jni_1zero_samples_SampleForTests_00024InnerStructA_clazz(JNIEn
 }
 #endif
 // Leaking this jclass as we cannot use LazyInstance from some threads.
-JNI_REGISTRATION_EXPORT std::atomic<jclass>
+JNI_ZERO_COMPONENT_BUILD_EXPORT std::atomic<jclass>
     g_org_jni_1zero_samples_SampleForTests_00024InnerStructB_clazz(nullptr);
 #ifndef org_jni_1zero_samples_SampleForTests_00024InnerStructB_clazz_defined
 #define org_jni_1zero_samples_SampleForTests_00024InnerStructB_clazz_defined
@@ -71,7 +72,7 @@ inline jclass org_jni_1zero_samples_SampleForTests_00024InnerStructB_clazz(JNIEn
 namespace base {
 namespace android {
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForTests_1addStructB(
     JNIEnv* env,
     jclass jcaller,
@@ -84,7 +85,7 @@ JNI_GENERATOR_EXPORT void
       base::android::JavaParamRef<jobject>(env, b));
 }
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForTests_1destroy(
     JNIEnv* env,
     jclass jcaller,
@@ -98,7 +99,7 @@ JNI_GENERATOR_EXPORT void
 static base::android::ScopedJavaLocalRef<jclass> JNI_SampleForTests_GetClass(JNIEnv* env, const
     base::android::JavaParamRef<jclass>& arg0);
 
-JNI_GENERATOR_EXPORT jclass
+JNI_BOUNDARY_EXPORT jclass
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForTests_1getClass(
     JNIEnv* env,
     jclass jcaller,
@@ -109,7 +110,7 @@ JNI_GENERATOR_EXPORT jclass
 static jdouble JNI_SampleForTests_GetDoubleFunction(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& caller);
 
-JNI_GENERATOR_EXPORT jdouble
+JNI_BOUNDARY_EXPORT jdouble
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForTests_1getDoubleFunction(
     JNIEnv* env,
     jclass jcaller,
@@ -120,7 +121,7 @@ JNI_GENERATOR_EXPORT jdouble
 
 static jfloat JNI_SampleForTests_GetFloatFunction(JNIEnv* env);
 
-JNI_GENERATOR_EXPORT jfloat
+JNI_BOUNDARY_EXPORT jfloat
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForTests_1getFloatFunction(
     JNIEnv* env,
     jclass jcaller) {
@@ -130,7 +131,7 @@ JNI_GENERATOR_EXPORT jfloat
 static base::android::ScopedJavaLocalRef<jobject> JNI_SampleForTests_GetNonPODDatatype(JNIEnv* env,
     const base::android::JavaParamRef<jobject>& caller);
 
-JNI_GENERATOR_EXPORT jobject
+JNI_BOUNDARY_EXPORT jobject
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForTests_1getNonPODDatatype(
     JNIEnv* env,
     jclass jcaller,
@@ -142,7 +143,7 @@ JNI_GENERATOR_EXPORT jobject
 static base::android::ScopedJavaLocalRef<jthrowable> JNI_SampleForTests_GetThrowable(JNIEnv* env,
     const base::android::JavaParamRef<jthrowable>& arg0);
 
-JNI_GENERATOR_EXPORT jthrowable
+JNI_BOUNDARY_EXPORT jthrowable
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForTests_1getThrowable(
     JNIEnv* env,
     jclass jcaller,
@@ -155,7 +156,7 @@ static jlong JNI_SampleForTests_Init(JNIEnv* env, const base::android::JavaParam
     caller,
     const base::android::JavaParamRef<jstring>& param);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForTests_1init(
     JNIEnv* env,
     jclass jcaller,
@@ -165,7 +166,7 @@ JNI_GENERATOR_EXPORT jlong
       base::android::JavaParamRef<jstring>(env, param));
 }
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForTests_1iterateAndDoSomethingWithStructB(
     JNIEnv* env,
     jclass jcaller,
@@ -177,7 +178,7 @@ JNI_GENERATOR_EXPORT void
       caller));
 }
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForTests_1method(
     JNIEnv* env,
     jclass jcaller,
@@ -188,7 +189,7 @@ JNI_GENERATOR_EXPORT jint
   return native->Method(env, base::android::JavaParamRef<jobject>(env, caller));
 }
 
-JNI_GENERATOR_EXPORT jdouble
+JNI_BOUNDARY_EXPORT jdouble
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForTests_1methodOtherP0(
     JNIEnv* env,
     jclass jcaller,
@@ -199,7 +200,7 @@ JNI_GENERATOR_EXPORT jdouble
   return native->MethodOtherP0(env, base::android::JavaParamRef<jobject>(env, caller));
 }
 
-JNI_GENERATOR_EXPORT jstring
+JNI_BOUNDARY_EXPORT jstring
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForTests_1returnAString(
     JNIEnv* env,
     jclass jcaller,
@@ -214,7 +215,7 @@ static void JNI_SampleForTests_SetNonPODDatatype(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& caller,
     const base::android::JavaParamRef<jobject>& rect);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForTests_1setNonPODDatatype(
     JNIEnv* env,
     jclass jcaller,

third_party/jni_zero/golden/testBirectionalNonProxy-SampleBidirectionalNonProxy_jni.h.golden

@@ -18,12 +18,12 @@
 
 // Step 1: Forward declarations.
 
-JNI_REGISTRATION_EXPORT extern const char
+JNI_ZERO_COMPONENT_BUILD_EXPORT extern const char
     kClassPath_org_jni_1zero_samples_SampleBidirectionalNonProxy[];
 const char kClassPath_org_jni_1zero_samples_SampleBidirectionalNonProxy[] =
     "org/jni_zero/samples/SampleBidirectionalNonProxy";
 // Leaking this jclass as we cannot use LazyInstance from some threads.
-JNI_REGISTRATION_EXPORT std::atomic<jclass>
+JNI_ZERO_COMPONENT_BUILD_EXPORT std::atomic<jclass>
     g_org_jni_1zero_samples_SampleBidirectionalNonProxy_clazz(nullptr);
 #ifndef org_jni_1zero_samples_SampleBidirectionalNonProxy_clazz_defined
 #define org_jni_1zero_samples_SampleBidirectionalNonProxy_clazz_defined
@@ -42,7 +42,7 @@ inline jclass org_jni_1zero_samples_SampleBidirectionalNonProxy_clazz(JNIEnv* en
 static jint JNI_SampleBidirectionalNonProxy_Init(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& jcaller);
 
-JNI_GENERATOR_EXPORT jint Java_org_jni_1zero_samples_SampleBidirectionalNonProxy_nativeInit(
+JNI_BOUNDARY_EXPORT jint Java_org_jni_1zero_samples_SampleBidirectionalNonProxy_nativeInit(
     JNIEnv* env,
     jobject jcaller) {
   return JNI_SampleBidirectionalNonProxy_Init(env, base::android::JavaParamRef<jobject>(env,
@@ -52,14 +52,14 @@ JNI_GENERATOR_EXPORT jint Java_org_jni_1zero_samples_SampleBidirectionalNonProxy
 static jint JNI_SampleBidirectionalNonProxy_Init(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& jcaller);
 
-JNI_GENERATOR_EXPORT jint Java_org_jni_1zero_samples_SampleBidirectionalNonProxy_nativeInit(
+JNI_BOUNDARY_EXPORT jint Java_org_jni_1zero_samples_SampleBidirectionalNonProxy_nativeInit(
     JNIEnv* env,
     jobject jcaller) {
   return JNI_SampleBidirectionalNonProxy_Init(env, base::android::JavaParamRef<jobject>(env,
       jcaller));
 }
 
-JNI_GENERATOR_EXPORT jint Java_org_jni_1zero_samples_SampleBidirectionalNonProxy_nativeMethod(
+JNI_BOUNDARY_EXPORT jint Java_org_jni_1zero_samples_SampleBidirectionalNonProxy_nativeMethod(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeTest,
@@ -69,7 +69,7 @@ JNI_GENERATOR_EXPORT jint Java_org_jni_1zero_samples_SampleBidirectionalNonProxy
   return native->Method(env, base::android::JavaParamRef<jobject>(env, jcaller), arg1);
 }
 
-JNI_GENERATOR_EXPORT jint Java_org_jni_1zero_samples_SampleBidirectionalNonProxy_nativeStaticMethod(
+JNI_BOUNDARY_EXPORT jint Java_org_jni_1zero_samples_SampleBidirectionalNonProxy_nativeStaticMethod(
     JNIEnv* env,
     jclass jcaller,
     jlong nativeTest,

third_party/jni_zero/golden/testEndToEndManualRegistration-Registration.h.golden

@@ -23,75 +23,75 @@
 
 // Step 2: Forward declarations (methods).
 
-JNI_GENERATOR_EXPORT jobject
+JNI_BOUNDARY_EXPORT jobject
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1bar(
     JNIEnv* env,
     jclass jcaller,
     jobject sample);
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1foo(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1hasPhalange(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jclass
+JNI_BOUNDARY_EXPORT jclass
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnClass(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnClasses(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobject
+JNI_BOUNDARY_EXPORT jobject
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnObject(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnObjects(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jstring
+JNI_BOUNDARY_EXPORT jstring
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnString(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnStrings(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobject
+JNI_BOUNDARY_EXPORT jobject
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnStruct(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnStructs(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jthrowable
+JNI_BOUNDARY_EXPORT jthrowable
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnThrowable(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnThrowables(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jstring
+JNI_BOUNDARY_EXPORT jstring
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1revString(
     JNIEnv* env,
     jclass jcaller,
     jstring stringToReverse);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1sendSamplesToNative(
     JNIEnv* env,
     jclass jcaller,
     jobjectArray strs);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1sendToNative(
     JNIEnv* env,
     jclass jcaller,
     jobjectArray strs);
-JNI_GENERATOR_EXPORT jintArray
+JNI_BOUNDARY_EXPORT jintArray
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1testAllPrimitives(
     JNIEnv* env,
     jclass jcaller,
@@ -111,7 +111,7 @@ JNI_GENERATOR_EXPORT jintArray
     jfloatArray floats,
     jboolean zbool,
     jbooleanArray bools);
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1testSpecialTypes(
     JNIEnv* env,
     jclass jcaller,
@@ -198,7 +198,7 @@ static const JNINativeMethod kMethods_org_jni_1zero_GEN_1JNI[] = {
 
 namespace {
 
-JNI_REGISTRATION_EXPORT bool RegisterNative_org_jni_1zero_GEN_1JNI(JNIEnv* env) {
+JNI_ZERO_COMPONENT_BUILD_EXPORT bool RegisterNative_org_jni_1zero_GEN_1JNI(JNIEnv* env) {
   const int number_of_methods = std::size(kMethods_org_jni_1zero_GEN_1JNI);
 
   base::android::ScopedJavaLocalRef<jclass> native_clazz =

third_party/jni_zero/golden/testEndToEndManualRegistration_NonProxy-Registration.h.golden

@@ -33,7 +33,7 @@ inline jclass org_jni_1zero_samples_SampleNonProxy_clazz(JNIEnv* env) {
 
 // Step 2: Forward declarations (methods).
 
-JNI_GENERATOR_EXPORT jlong Java_org_jni_1zero_samples_SampleNonProxy_nativeAddBookmark(
+JNI_BOUNDARY_EXPORT jlong Java_org_jni_1zero_samples_SampleNonProxy_nativeAddBookmark(
     JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider,
@@ -41,7 +41,7 @@ JNI_GENERATOR_EXPORT jlong Java_org_jni_1zero_samples_SampleNonProxy_nativeAddBo
     jstring title,
     jboolean isFolder,
     jlong parentId);
-JNI_GENERATOR_EXPORT jlong Java_org_jni_1zero_samples_SampleNonProxy_nativeAddBookmarkFromAPI(
+JNI_BOUNDARY_EXPORT jlong Java_org_jni_1zero_samples_SampleNonProxy_nativeAddBookmarkFromAPI(
     JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider,
@@ -52,54 +52,54 @@ JNI_GENERATOR_EXPORT jlong Java_org_jni_1zero_samples_SampleNonProxy_nativeAddBo
     jbyteArray favicon,
     jstring title,
     jobject visits);
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_samples_SampleNonProxy_nativeCreateHistoricalTabFromState(
     JNIEnv* env,
     jclass jcaller,
     jbyteArray state,
     jint tabIndex);
-JNI_GENERATOR_EXPORT void Java_org_jni_1zero_samples_SampleNonProxy_nativeDestroy(
+JNI_BOUNDARY_EXPORT void Java_org_jni_1zero_samples_SampleNonProxy_nativeDestroy(
     JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider);
-JNI_GENERATOR_EXPORT jint Java_org_jni_1zero_samples_SampleNonProxy_nativeFindAll(
+JNI_BOUNDARY_EXPORT jint Java_org_jni_1zero_samples_SampleNonProxy_nativeFindAll(
     JNIEnv* env,
     jobject jcaller,
     jstring find);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_org_jni_1zero_samples_SampleNonProxy_nativeGetAutofillProfileGUIDs(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jstring Java_org_jni_1zero_samples_SampleNonProxy_nativeGetDomainAndRegistry(
+JNI_BOUNDARY_EXPORT jstring Java_org_jni_1zero_samples_SampleNonProxy_nativeGetDomainAndRegistry(
     JNIEnv* env,
     jclass jcaller,
     jstring url);
-JNI_GENERATOR_EXPORT jobject Java_org_jni_1zero_samples_SampleNonProxy_nativeGetInnerClass(
+JNI_BOUNDARY_EXPORT jobject Java_org_jni_1zero_samples_SampleNonProxy_nativeGetInnerClass(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jbyteArray Java_org_jni_1zero_samples_SampleNonProxy_nativeGetStateAsByteArray(
+JNI_BOUNDARY_EXPORT jbyteArray Java_org_jni_1zero_samples_SampleNonProxy_nativeGetStateAsByteArray(
     JNIEnv* env,
     jobject jcaller,
     jobject view);
-JNI_GENERATOR_EXPORT void Java_org_jni_1zero_samples_SampleNonProxy_nativeGotOrientation(
+JNI_BOUNDARY_EXPORT void Java_org_jni_1zero_samples_SampleNonProxy_nativeGotOrientation(
     JNIEnv* env,
     jobject jcaller,
     jint nativeDataFetcherImplAndroid,
     jdouble alpha,
     jdouble beta,
     jdouble gamma);
-JNI_GENERATOR_EXPORT jint Java_org_jni_1zero_samples_SampleNonProxy_nativeInit(
+JNI_BOUNDARY_EXPORT jint Java_org_jni_1zero_samples_SampleNonProxy_nativeInit(
     JNIEnv* env,
     jobject jcaller);
-JNI_GENERATOR_EXPORT jint Java_org_jni_1zero_samples_SampleNonProxy_nativeInit(
+JNI_BOUNDARY_EXPORT jint Java_org_jni_1zero_samples_SampleNonProxy_nativeInit(
     JNIEnv* env,
     jobject jcaller);
-JNI_GENERATOR_EXPORT jthrowable
+JNI_BOUNDARY_EXPORT jthrowable
     Java_org_jni_1zero_samples_SampleNonProxy_nativeMessWithJavaException(
     JNIEnv* env,
     jclass jcaller,
     jthrowable e);
-JNI_GENERATOR_EXPORT jobject Java_org_jni_1zero_samples_SampleNonProxy_nativeQueryBitmap(
+JNI_BOUNDARY_EXPORT jobject Java_org_jni_1zero_samples_SampleNonProxy_nativeQueryBitmap(
     JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider,
@@ -107,7 +107,7 @@ JNI_GENERATOR_EXPORT jobject Java_org_jni_1zero_samples_SampleNonProxy_nativeQue
     jstring selection,
     jobjectArray selectionArgs,
     jstring sortOrder);
-JNI_GENERATOR_EXPORT void Java_org_jni_1zero_samples_SampleNonProxy_nativeSetRecognitionResults(
+JNI_BOUNDARY_EXPORT void Java_org_jni_1zero_samples_SampleNonProxy_nativeSetRecognitionResults(
     JNIEnv* env,
     jobject jcaller,
     jint sessionId,
@@ -159,7 +159,8 @@ static const JNINativeMethod kMethods_org_jni_1zero_samples_SampleNonProxy[] = {
 };
 
 
-JNI_REGISTRATION_EXPORT bool RegisterNative_org_jni_1zero_samples_SampleNonProxy(JNIEnv* env) {
+JNI_ZERO_COMPONENT_BUILD_EXPORT bool RegisterNative_org_jni_1zero_samples_SampleNonProxy(JNIEnv*
+    env) {
   const int kMethods_org_jni_1zero_samples_SampleNonProxySize =
       std::size(kMethods_org_jni_1zero_samples_SampleNonProxy);
   if (env->RegisterNatives(

third_party/jni_zero/golden/testEndToEndProxyHashed-Registration.h.golden

@@ -23,59 +23,59 @@
 
 // Step 2: Forward declarations (methods).
 
-JNI_GENERATOR_EXPORT jobject Java_J_N_MxkAf2fl(
+JNI_BOUNDARY_EXPORT jobject Java_J_N_MxkAf2fl(
     JNIEnv* env,
     jclass jcaller,
     jobject sample);
-JNI_GENERATOR_EXPORT void Java_J_N_Md6LK1o9(
+JNI_BOUNDARY_EXPORT void Java_J_N_Md6LK1o9(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jboolean Java_J_N_M_000244zYzAg(
+JNI_BOUNDARY_EXPORT jboolean Java_J_N_M_000244zYzAg(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jclass Java_J_N_M4l0zJba(
+JNI_BOUNDARY_EXPORT jclass Java_J_N_M4l0zJba(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_MKH66mnL(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_MKH66mnL(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobject Java_J_N_Mvc7ImXr(
+JNI_BOUNDARY_EXPORT jobject Java_J_N_Mvc7ImXr(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_MocgXEXX(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_MocgXEXX(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jstring Java_J_N_M3yd9YCr(
+JNI_BOUNDARY_EXPORT jstring Java_J_N_M3yd9YCr(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_M_1qL1Hyw(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_M_1qL1Hyw(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobject Java_J_N_MxvVNTxJ(
+JNI_BOUNDARY_EXPORT jobject Java_J_N_MxvVNTxJ(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_MJLr_000245QK(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_MJLr_000245QK(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jthrowable Java_J_N_MXcljN68(
+JNI_BOUNDARY_EXPORT jthrowable Java_J_N_MXcljN68(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_M1FJFJy5(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_M1FJFJy5(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jstring Java_J_N_MGrgOT84(
+JNI_BOUNDARY_EXPORT jstring Java_J_N_MGrgOT84(
     JNIEnv* env,
     jclass jcaller,
     jstring stringToReverse);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_MMtgBdva(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_MMtgBdva(
     JNIEnv* env,
     jclass jcaller,
     jobjectArray strs);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_MPVz5ily(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_MPVz5ily(
     JNIEnv* env,
     jclass jcaller,
     jobjectArray strs);
-JNI_GENERATOR_EXPORT jintArray Java_J_N_MHRNkgW8(
+JNI_BOUNDARY_EXPORT jintArray Java_J_N_MHRNkgW8(
     JNIEnv* env,
     jclass jcaller,
     jint zint,
@@ -94,7 +94,7 @@ JNI_GENERATOR_EXPORT jintArray Java_J_N_MHRNkgW8(
     jfloatArray floats,
     jboolean zbool,
     jbooleanArray bools);
-JNI_GENERATOR_EXPORT void Java_J_N_MEbp5PPc(
+JNI_BOUNDARY_EXPORT void Java_J_N_MEbp5PPc(
     JNIEnv* env,
     jclass jcaller,
     jclass clazz,

third_party/jni_zero/golden/testEndToEndProxyJniWithModules-Registration.h.golden

@@ -23,11 +23,11 @@
 
 // Step 2: Forward declarations (methods).
 
-JNI_GENERATOR_EXPORT jboolean Java_J_module_1N_MaOHChCD(
+JNI_BOUNDARY_EXPORT jboolean Java_J_module_1N_MaOHChCD(
     JNIEnv* env,
     jclass jcaller,
     jint a);
-JNI_GENERATOR_EXPORT void Java_J_module_1N_MF1ZO_1It(
+JNI_BOUNDARY_EXPORT void Java_J_module_1N_MF1ZO_1It(
     JNIEnv* env,
     jclass jcaller);
 

third_party/jni_zero/golden/testEndToEndProxyJniWithModules-SampleModule_jni.h.golden

@@ -25,7 +25,7 @@
 // Step 3: Method stubs.
 static jboolean JNI_SampleModule_Bar(JNIEnv* env, jint a);
 
-JNI_GENERATOR_EXPORT jboolean Java_J_module_1N_MaOHChCD(
+JNI_BOUNDARY_EXPORT jboolean Java_J_module_1N_MaOHChCD(
     JNIEnv* env,
     jclass jcaller,
     jint a) {
@@ -34,7 +34,7 @@ JNI_GENERATOR_EXPORT jboolean Java_J_module_1N_MaOHChCD(
 
 static void JNI_SampleModule_Foo(JNIEnv* env);
 
-JNI_GENERATOR_EXPORT void Java_J_module_1N_MF1ZO_1It(
+JNI_BOUNDARY_EXPORT void Java_J_module_1N_MF1ZO_1It(
     JNIEnv* env,
     jclass jcaller) {
   return JNI_SampleModule_Foo(env);

third_party/jni_zero/golden/testForTestingKept-Registration.h.golden

@@ -33,55 +33,55 @@ inline jclass org_jni_1zero_samples_SampleProxyEdgeCases_clazz(JNIEnv* env) {
 
 // Step 2: Forward declarations (methods).
 
-JNI_GENERATOR_EXPORT jint Java_J_N_MyLYIXSG(
+JNI_BOUNDARY_EXPORT jint Java_J_N_MyLYIXSG(
     JNIEnv* env,
     jclass jcaller,
     jobject caller,
     jobject b);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_M4tCs4sR(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_M4tCs4sR(
     JNIEnv* env,
     jclass jcaller,
     jintArray a,
     jobjectArray b);
-JNI_GENERATOR_EXPORT jintArray Java_J_N_Mfw_00024B7iJ(
+JNI_BOUNDARY_EXPORT jintArray Java_J_N_Mfw_00024B7iJ(
     JNIEnv* env,
     jclass jcaller,
     jintArray a,
     jobjectArray b);
-JNI_GENERATOR_EXPORT void Java_J_N_M01DKxMA_1ForTesting(
+JNI_BOUNDARY_EXPORT void Java_J_N_M01DKxMA_1ForTesting(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT void Java_J_N_MdPg5w5a_1ForTesting(
+JNI_BOUNDARY_EXPORT void Java_J_N_MdPg5w5a_1ForTesting(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT void Java_J_N_Mfc_1XrOy_1ForTesting(
+JNI_BOUNDARY_EXPORT void Java_J_N_Mfc_1XrOy_1ForTesting(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT void Java_J_N_MDx0XFh_00024(
+JNI_BOUNDARY_EXPORT void Java_J_N_MDx0XFh_00024(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_MPuD3r24(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_MPuD3r24(
     JNIEnv* env,
     jclass jcaller,
     jobjectArray arg);
-JNI_GENERATOR_EXPORT void Java_J_N_MYc9Cume(
+JNI_BOUNDARY_EXPORT void Java_J_N_MYc9Cume(
     JNIEnv* env,
     jclass jcaller,
     jobject b,
     jobject i);
-JNI_GENERATOR_EXPORT jboolean Java_J_N_MoYVNDqu(
+JNI_BOUNDARY_EXPORT jboolean Java_J_N_MoYVNDqu(
     JNIEnv* env,
     jclass jcaller,
     jobject sb);
-JNI_GENERATOR_EXPORT jint Java_J_N_MoYVNDqu(
+JNI_BOUNDARY_EXPORT jint Java_J_N_MoYVNDqu(
     JNIEnv* env,
     jclass jcaller,
     jint sb);
-JNI_GENERATOR_EXPORT void Java_org_jni_1zero_samples_SampleProxyEdgeCases_nativeInstanceMethod(
+JNI_BOUNDARY_EXPORT void Java_org_jni_1zero_samples_SampleProxyEdgeCases_nativeInstanceMethod(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeInstance);
-JNI_GENERATOR_EXPORT void Java_org_jni_1zero_samples_SampleProxyEdgeCases_nativeStaticMethod(
+JNI_BOUNDARY_EXPORT void Java_org_jni_1zero_samples_SampleProxyEdgeCases_nativeStaticMethod(
     JNIEnv* env,
     jclass jcaller);
 

third_party/jni_zero/golden/testForTestingKept-SampleProxyEdgeCases_jni.h.golden

@@ -18,11 +18,12 @@
 
 // Step 1: Forward declarations.
 
-JNI_REGISTRATION_EXPORT extern const char kClassPath_org_jni_1zero_samples_SampleProxyEdgeCases[];
+JNI_ZERO_COMPONENT_BUILD_EXPORT extern const char
+    kClassPath_org_jni_1zero_samples_SampleProxyEdgeCases[];
 const char kClassPath_org_jni_1zero_samples_SampleProxyEdgeCases[] =
     "org/jni_zero/samples/SampleProxyEdgeCases";
 // Leaking this jclass as we cannot use LazyInstance from some threads.
-JNI_REGISTRATION_EXPORT std::atomic<jclass>
+JNI_ZERO_COMPONENT_BUILD_EXPORT std::atomic<jclass>
     g_org_jni_1zero_samples_SampleProxyEdgeCases_clazz(nullptr);
 #ifndef org_jni_1zero_samples_SampleProxyEdgeCases_clazz_defined
 #define org_jni_1zero_samples_SampleProxyEdgeCases_clazz_defined
@@ -41,7 +42,7 @@ static jint JNI_SampleProxyEdgeCases_AddStructB(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& caller,
     const base::android::JavaParamRef<jobject>& b);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleProxyEdgeCases_1addStructB(
     JNIEnv* env,
     jclass jcaller,
@@ -55,7 +56,7 @@ static base::android::ScopedJavaLocalRef<jobjectArray> JNI_SampleProxyEdgeCases_
     env, const base::android::JavaParamRef<jintArray>& a,
     const base::android::JavaParamRef<jobjectArray>& b);
 
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleProxyEdgeCases_1arrayTypes1(
     JNIEnv* env,
     jclass jcaller,
@@ -69,7 +70,7 @@ static base::android::ScopedJavaLocalRef<jintArray> JNI_SampleProxyEdgeCases_Arr
     env, const base::android::JavaParamRef<jintArray>& a,
     const base::android::JavaParamRef<jobjectArray>& b);
 
-JNI_GENERATOR_EXPORT jintArray
+JNI_BOUNDARY_EXPORT jintArray
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleProxyEdgeCases_1arrayTypes2(
     JNIEnv* env,
     jclass jcaller,
@@ -81,7 +82,7 @@ JNI_GENERATOR_EXPORT jintArray
 
 static void JNI_SampleProxyEdgeCases_FooForTest(JNIEnv* env);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleProxyEdgeCases_1fooForTest(
     JNIEnv* env,
     jclass jcaller) {
@@ -90,7 +91,7 @@ JNI_GENERATOR_EXPORT void
 
 static void JNI_SampleProxyEdgeCases_FooForTesting(JNIEnv* env);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleProxyEdgeCases_1fooForTesting(
     JNIEnv* env,
     jclass jcaller) {
@@ -99,7 +100,7 @@ JNI_GENERATOR_EXPORT void
 
 static void JNI_SampleProxyEdgeCases_FooForTests(JNIEnv* env);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleProxyEdgeCases_1fooForTests(
     JNIEnv* env,
     jclass jcaller) {
@@ -108,7 +109,7 @@ JNI_GENERATOR_EXPORT void
 
 static void JNI_SampleProxyEdgeCases_Foo__weirdly__escaped_name1(JNIEnv* env);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleProxyEdgeCases_1foo_11_11weirdly_11_11escaped_11name1(
     JNIEnv* env,
     jclass jcaller) {
@@ -119,7 +120,7 @@ static base::android::ScopedJavaLocalRef<jobjectArray>
     JNI_SampleProxyEdgeCases_GenericsWithNestedClassArray(JNIEnv* env, const
     base::android::JavaParamRef<jobjectArray>& arg);
 
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleProxyEdgeCases_1genericsWithNestedClassArray(
     JNIEnv* env,
     jclass jcaller,
@@ -132,7 +133,7 @@ static void JNI_SampleProxyEdgeCases_SetBool(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& b,
     const base::android::JavaParamRef<jobject>& i);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleProxyEdgeCases_1setBool(
     JNIEnv* env,
     jclass jcaller,
@@ -145,7 +146,7 @@ JNI_GENERATOR_EXPORT void
 static jboolean JNI_SampleProxyEdgeCases_SetStringBuilder(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& sb);
 
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleProxyEdgeCases_1setStringBuilder(
     JNIEnv* env,
     jclass jcaller,
@@ -156,7 +157,7 @@ JNI_GENERATOR_EXPORT jboolean
 
 static jint JNI_SampleProxyEdgeCases_SetStringBuilder(JNIEnv* env, jint sb);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleProxyEdgeCases_1setStringBuilder(
     JNIEnv* env,
     jclass jcaller,
@@ -164,7 +165,7 @@ JNI_GENERATOR_EXPORT jint
   return JNI_SampleProxyEdgeCases_SetStringBuilder(env, sb);
 }
 
-JNI_GENERATOR_EXPORT void Java_org_jni_1zero_samples_SampleProxyEdgeCases_nativeInstanceMethod(
+JNI_BOUNDARY_EXPORT void Java_org_jni_1zero_samples_SampleProxyEdgeCases_nativeInstanceMethod(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeInstance) {
@@ -175,7 +176,7 @@ JNI_GENERATOR_EXPORT void Java_org_jni_1zero_samples_SampleProxyEdgeCases_native
 
 static void JNI_SampleProxyEdgeCases_StaticMethod(JNIEnv* env);
 
-JNI_GENERATOR_EXPORT void Java_org_jni_1zero_samples_SampleProxyEdgeCases_nativeStaticMethod(
+JNI_BOUNDARY_EXPORT void Java_org_jni_1zero_samples_SampleProxyEdgeCases_nativeStaticMethod(
     JNIEnv* env,
     jclass jcaller) {
   return JNI_SampleProxyEdgeCases_StaticMethod(env);

third_party/jni_zero/golden/testForTestingRemoved-Registration.h.golden

@@ -33,55 +33,55 @@ inline jclass org_jni_1zero_samples_SampleProxyEdgeCases_clazz(JNIEnv* env) {
 
 // Step 2: Forward declarations (methods).
 
-JNI_GENERATOR_EXPORT jint Java_J_N_MyLYIXSG(
+JNI_BOUNDARY_EXPORT jint Java_J_N_MyLYIXSG(
     JNIEnv* env,
     jclass jcaller,
     jobject caller,
     jobject b);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_M4tCs4sR(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_M4tCs4sR(
     JNIEnv* env,
     jclass jcaller,
     jintArray a,
     jobjectArray b);
-JNI_GENERATOR_EXPORT jintArray Java_J_N_Mfw_00024B7iJ(
+JNI_BOUNDARY_EXPORT jintArray Java_J_N_Mfw_00024B7iJ(
     JNIEnv* env,
     jclass jcaller,
     jintArray a,
     jobjectArray b);
-JNI_GENERATOR_EXPORT void Java_J_N_M01DKxMA_1ForTesting(
+JNI_BOUNDARY_EXPORT void Java_J_N_M01DKxMA_1ForTesting(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT void Java_J_N_MdPg5w5a_1ForTesting(
+JNI_BOUNDARY_EXPORT void Java_J_N_MdPg5w5a_1ForTesting(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT void Java_J_N_Mfc_1XrOy_1ForTesting(
+JNI_BOUNDARY_EXPORT void Java_J_N_Mfc_1XrOy_1ForTesting(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT void Java_J_N_MDx0XFh_00024(
+JNI_BOUNDARY_EXPORT void Java_J_N_MDx0XFh_00024(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_MPuD3r24(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_MPuD3r24(
     JNIEnv* env,
     jclass jcaller,
     jobjectArray arg);
-JNI_GENERATOR_EXPORT void Java_J_N_MYc9Cume(
+JNI_BOUNDARY_EXPORT void Java_J_N_MYc9Cume(
     JNIEnv* env,
     jclass jcaller,
     jobject b,
     jobject i);
-JNI_GENERATOR_EXPORT jboolean Java_J_N_MoYVNDqu(
+JNI_BOUNDARY_EXPORT jboolean Java_J_N_MoYVNDqu(
     JNIEnv* env,
     jclass jcaller,
     jobject sb);
-JNI_GENERATOR_EXPORT jint Java_J_N_MoYVNDqu(
+JNI_BOUNDARY_EXPORT jint Java_J_N_MoYVNDqu(
     JNIEnv* env,
     jclass jcaller,
     jint sb);
-JNI_GENERATOR_EXPORT void Java_org_jni_1zero_samples_SampleProxyEdgeCases_nativeInstanceMethod(
+JNI_BOUNDARY_EXPORT void Java_org_jni_1zero_samples_SampleProxyEdgeCases_nativeInstanceMethod(
     JNIEnv* env,
     jobject jcaller,
     jlong nativeInstance);
-JNI_GENERATOR_EXPORT void Java_org_jni_1zero_samples_SampleProxyEdgeCases_nativeStaticMethod(
+JNI_BOUNDARY_EXPORT void Java_org_jni_1zero_samples_SampleProxyEdgeCases_nativeStaticMethod(
     JNIEnv* env,
     jclass jcaller);
 

third_party/jni_zero/golden/testFromClassFile-JavapClass_jni.h.golden

@@ -18,10 +18,11 @@
 
 // Step 1: Forward declarations.
 
-JNI_REGISTRATION_EXPORT extern const char kClassPath_org_jni_1zero_samples_JavapClass[];
+JNI_ZERO_COMPONENT_BUILD_EXPORT extern const char kClassPath_org_jni_1zero_samples_JavapClass[];
 const char kClassPath_org_jni_1zero_samples_JavapClass[] = "org/jni_zero/samples/JavapClass";
 // Leaking this jclass as we cannot use LazyInstance from some threads.
-JNI_REGISTRATION_EXPORT std::atomic<jclass> g_org_jni_1zero_samples_JavapClass_clazz(nullptr);
+JNI_ZERO_COMPONENT_BUILD_EXPORT std::atomic<jclass>
+    g_org_jni_1zero_samples_JavapClass_clazz(nullptr);
 #ifndef org_jni_1zero_samples_JavapClass_clazz_defined
 #define org_jni_1zero_samples_JavapClass_clazz_defined
 inline jclass org_jni_1zero_samples_JavapClass_clazz(JNIEnv* env) {

third_party/jni_zero/golden/testMultiplexing-Registration.h.golden

@@ -23,59 +23,59 @@
 
 // Step 2: Forward declarations (methods).
 
-JNI_GENERATOR_EXPORT jobject Java_J_N_MxkAf2fl(
+JNI_BOUNDARY_EXPORT jobject Java_J_N_MxkAf2fl(
     JNIEnv* env,
     jclass jcaller,
     jobject sample);
-JNI_GENERATOR_EXPORT void Java_J_N_Md6LK1o9(
+JNI_BOUNDARY_EXPORT void Java_J_N_Md6LK1o9(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jboolean Java_J_N_M_000244zYzAg(
+JNI_BOUNDARY_EXPORT jboolean Java_J_N_M_000244zYzAg(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jclass Java_J_N_M4l0zJba(
+JNI_BOUNDARY_EXPORT jclass Java_J_N_M4l0zJba(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_MKH66mnL(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_MKH66mnL(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobject Java_J_N_Mvc7ImXr(
+JNI_BOUNDARY_EXPORT jobject Java_J_N_Mvc7ImXr(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_MocgXEXX(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_MocgXEXX(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jstring Java_J_N_M3yd9YCr(
+JNI_BOUNDARY_EXPORT jstring Java_J_N_M3yd9YCr(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_M_1qL1Hyw(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_M_1qL1Hyw(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobject Java_J_N_MxvVNTxJ(
+JNI_BOUNDARY_EXPORT jobject Java_J_N_MxvVNTxJ(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_MJLr_000245QK(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_MJLr_000245QK(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jthrowable Java_J_N_MXcljN68(
+JNI_BOUNDARY_EXPORT jthrowable Java_J_N_MXcljN68(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_M1FJFJy5(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_M1FJFJy5(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jstring Java_J_N_MGrgOT84(
+JNI_BOUNDARY_EXPORT jstring Java_J_N_MGrgOT84(
     JNIEnv* env,
     jclass jcaller,
     jstring stringToReverse);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_MMtgBdva(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_MMtgBdva(
     JNIEnv* env,
     jclass jcaller,
     jobjectArray strs);
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_MPVz5ily(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_MPVz5ily(
     JNIEnv* env,
     jclass jcaller,
     jobjectArray strs);
-JNI_GENERATOR_EXPORT jintArray Java_J_N_MHRNkgW8(
+JNI_BOUNDARY_EXPORT jintArray Java_J_N_MHRNkgW8(
     JNIEnv* env,
     jclass jcaller,
     jint zint,
@@ -94,7 +94,7 @@ JNI_GENERATOR_EXPORT jintArray Java_J_N_MHRNkgW8(
     jfloatArray floats,
     jboolean zbool,
     jbooleanArray bools);
-JNI_GENERATOR_EXPORT void Java_J_N_MEbp5PPc(
+JNI_BOUNDARY_EXPORT void Java_J_N_MEbp5PPc(
     JNIEnv* env,
     jclass jcaller,
     jclass clazz,
@@ -109,7 +109,7 @@ JNI_GENERATOR_EXPORT void Java_J_N_MEbp5PPc(
     jobjectArray objects);
 
 
-JNI_GENERATOR_EXPORT void Java_J_N_resolve_1for_1void_1LLATTARRAOOAOOA(
+JNI_BOUNDARY_EXPORT void Java_J_N_resolve_1for_1void_1LLATTARRAOOAOOA(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num, jclass class_param1, jobjectArray class_array_param1, jthrowable throwable_param1, jobjectArray throwable_array_param1, jstring string_param1, jobjectArray string_array_param1, jobject object_param1, jobjectArray object_array_param1, jobject object_param2, jobjectArray object_array_param2) {
@@ -123,7 +123,7 @@ JNI_GENERATOR_EXPORT void Java_J_N_resolve_1for_1void_1LLATTARRAOOAOOA(
             return;
         }
 }
-JNI_GENERATOR_EXPORT jintArray Java_J_N_resolve_1for_1int_1array_1IIAJJASSACCABBADDAFFAZZA(
+JNI_BOUNDARY_EXPORT jintArray Java_J_N_resolve_1for_1int_1array_1IIAJJASSACCABBADDAFFAZZA(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num, jint int_param1, jintArray int_array_param1, jlong long_param1, jlongArray long_array_param1, jshort short_param1, jshortArray short_array_param1, jchar char_param1, jcharArray char_array_param1, jbyte byte_param1, jbyteArray byte_array_param1, jdouble double_param1, jdoubleArray double_array_param1, jfloat float_param1, jfloatArray float_array_param1, jboolean boolean_param1, jbooleanArray boolean_array_param1) {
@@ -137,7 +137,7 @@ JNI_GENERATOR_EXPORT jintArray Java_J_N_resolve_1for_1int_1array_1IIAJJASSACCABB
             return {};
         }
 }
-JNI_GENERATOR_EXPORT jclass Java_J_N_resolve_1for_1class(
+JNI_BOUNDARY_EXPORT jclass Java_J_N_resolve_1for_1class(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num) {
@@ -151,7 +151,7 @@ JNI_GENERATOR_EXPORT jclass Java_J_N_resolve_1for_1class(
             return {};
         }
 }
-JNI_GENERATOR_EXPORT jobject Java_J_N_resolve_1for_1object(
+JNI_BOUNDARY_EXPORT jobject Java_J_N_resolve_1for_1object(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num) {
@@ -168,7 +168,7 @@ JNI_GENERATOR_EXPORT jobject Java_J_N_resolve_1for_1object(
             return {};
         }
 }
-JNI_GENERATOR_EXPORT jstring Java_J_N_resolve_1for_1string(
+JNI_BOUNDARY_EXPORT jstring Java_J_N_resolve_1for_1string(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num) {
@@ -182,7 +182,7 @@ JNI_GENERATOR_EXPORT jstring Java_J_N_resolve_1for_1string(
             return {};
         }
 }
-JNI_GENERATOR_EXPORT jstring Java_J_N_resolve_1for_1string_1R(
+JNI_BOUNDARY_EXPORT jstring Java_J_N_resolve_1for_1string_1R(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num, jstring string_param1) {
@@ -196,7 +196,7 @@ JNI_GENERATOR_EXPORT jstring Java_J_N_resolve_1for_1string_1R(
             return {};
         }
 }
-JNI_GENERATOR_EXPORT jthrowable Java_J_N_resolve_1for_1throwable(
+JNI_BOUNDARY_EXPORT jthrowable Java_J_N_resolve_1for_1throwable(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num) {
@@ -210,7 +210,7 @@ JNI_GENERATOR_EXPORT jthrowable Java_J_N_resolve_1for_1throwable(
             return {};
         }
 }
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_resolve_1for_1class_1array(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_resolve_1for_1class_1array(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num) {
@@ -224,7 +224,7 @@ JNI_GENERATOR_EXPORT jobjectArray Java_J_N_resolve_1for_1class_1array(
             return {};
         }
 }
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_resolve_1for_1object_1array(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_resolve_1for_1object_1array(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num) {
@@ -241,7 +241,7 @@ JNI_GENERATOR_EXPORT jobjectArray Java_J_N_resolve_1for_1object_1array(
             return {};
         }
 }
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_resolve_1for_1object_1array_1OA(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_resolve_1for_1object_1array_1OA(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num, jobjectArray object_array_param1) {
@@ -255,7 +255,7 @@ JNI_GENERATOR_EXPORT jobjectArray Java_J_N_resolve_1for_1object_1array_1OA(
             return {};
         }
 }
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_resolve_1for_1string_1array(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_resolve_1for_1string_1array(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num) {
@@ -269,7 +269,7 @@ JNI_GENERATOR_EXPORT jobjectArray Java_J_N_resolve_1for_1string_1array(
             return {};
         }
 }
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_resolve_1for_1string_1array_1RA(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_resolve_1for_1string_1array_1RA(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num, jobjectArray string_array_param1) {
@@ -283,7 +283,7 @@ JNI_GENERATOR_EXPORT jobjectArray Java_J_N_resolve_1for_1string_1array_1RA(
             return {};
         }
 }
-JNI_GENERATOR_EXPORT jobjectArray Java_J_N_resolve_1for_1throwable_1array(
+JNI_BOUNDARY_EXPORT jobjectArray Java_J_N_resolve_1for_1throwable_1array(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num) {
@@ -297,7 +297,7 @@ JNI_GENERATOR_EXPORT jobjectArray Java_J_N_resolve_1for_1throwable_1array(
             return {};
         }
 }
-JNI_GENERATOR_EXPORT jboolean Java_J_N_resolve_1for_1boolean(
+JNI_BOUNDARY_EXPORT jboolean Java_J_N_resolve_1for_1boolean(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num) {
@@ -311,7 +311,7 @@ JNI_GENERATOR_EXPORT jboolean Java_J_N_resolve_1for_1boolean(
             return {};
         }
 }
-JNI_GENERATOR_EXPORT void Java_J_N_resolve_1for_1void(
+JNI_BOUNDARY_EXPORT void Java_J_N_resolve_1for_1void(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num) {
@@ -325,7 +325,7 @@ JNI_GENERATOR_EXPORT void Java_J_N_resolve_1for_1void(
             return;
         }
 }
-JNI_GENERATOR_EXPORT jobject Java_J_N_resolve_1for_1object_1O(
+JNI_BOUNDARY_EXPORT jobject Java_J_N_resolve_1for_1object_1O(
     JNIEnv* env,
     jclass jcaller,
     jlong switch_num, jobject object_param1) {

third_party/jni_zero/golden/testNonProxy-SampleNonProxy_jni.h.golden

@@ -18,11 +18,12 @@
 
 // Step 1: Forward declarations.
 
-JNI_REGISTRATION_EXPORT extern const char kClassPath_org_jni_1zero_samples_SampleNonProxy[];
+JNI_ZERO_COMPONENT_BUILD_EXPORT extern const char kClassPath_org_jni_1zero_samples_SampleNonProxy[];
 const char kClassPath_org_jni_1zero_samples_SampleNonProxy[] =
     "org/jni_zero/samples/SampleNonProxy";
 // Leaking this jclass as we cannot use LazyInstance from some threads.
-JNI_REGISTRATION_EXPORT std::atomic<jclass> g_org_jni_1zero_samples_SampleNonProxy_clazz(nullptr);
+JNI_ZERO_COMPONENT_BUILD_EXPORT std::atomic<jclass>
+    g_org_jni_1zero_samples_SampleNonProxy_clazz(nullptr);
 #ifndef org_jni_1zero_samples_SampleNonProxy_clazz_defined
 #define org_jni_1zero_samples_SampleNonProxy_clazz_defined
 inline jclass org_jni_1zero_samples_SampleNonProxy_clazz(JNIEnv* env) {
@@ -44,7 +45,7 @@ static jlong JNI_SampleNonProxy_AddBookmark(JNIEnv* env, const base::android::Ja
     jboolean isFolder,
     jlong parentId);
 
-JNI_GENERATOR_EXPORT jlong Java_org_jni_1zero_samples_SampleNonProxy_nativeAddBookmark(
+JNI_BOUNDARY_EXPORT jlong Java_org_jni_1zero_samples_SampleNonProxy_nativeAddBookmark(
     JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider,
@@ -68,7 +69,7 @@ static jlong JNI_SampleNonProxy_AddBookmarkFromAPI(JNIEnv* env, const
     const base::android::JavaParamRef<jstring>& title,
     const base::android::JavaParamRef<jobject>& visits);
 
-JNI_GENERATOR_EXPORT jlong Java_org_jni_1zero_samples_SampleNonProxy_nativeAddBookmarkFromAPI(
+JNI_BOUNDARY_EXPORT jlong Java_org_jni_1zero_samples_SampleNonProxy_nativeAddBookmarkFromAPI(
     JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider,
@@ -92,7 +93,7 @@ static void JNI_SampleNonProxy_CreateHistoricalTabFromState(JNIEnv* env, const
     base::android::JavaParamRef<jbyteArray>& state,
     jint tabIndex);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_samples_SampleNonProxy_nativeCreateHistoricalTabFromState(
     JNIEnv* env,
     jclass jcaller,
@@ -106,7 +107,7 @@ static void JNI_SampleNonProxy_Destroy(JNIEnv* env, const base::android::JavaPar
     jcaller,
     jint nativeChromeBrowserProvider);
 
-JNI_GENERATOR_EXPORT void Java_org_jni_1zero_samples_SampleNonProxy_nativeDestroy(
+JNI_BOUNDARY_EXPORT void Java_org_jni_1zero_samples_SampleNonProxy_nativeDestroy(
     JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider) {
@@ -118,7 +119,7 @@ static jint JNI_SampleNonProxy_FindAll(JNIEnv* env, const base::android::JavaPar
     jcaller,
     const base::android::JavaParamRef<jstring>& find);
 
-JNI_GENERATOR_EXPORT jint Java_org_jni_1zero_samples_SampleNonProxy_nativeFindAll(
+JNI_BOUNDARY_EXPORT jint Java_org_jni_1zero_samples_SampleNonProxy_nativeFindAll(
     JNIEnv* env,
     jobject jcaller,
     jstring find) {
@@ -129,7 +130,7 @@ JNI_GENERATOR_EXPORT jint Java_org_jni_1zero_samples_SampleNonProxy_nativeFindAl
 static base::android::ScopedJavaLocalRef<jobjectArray>
     JNI_SampleNonProxy_GetAutofillProfileGUIDs(JNIEnv* env);
 
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_org_jni_1zero_samples_SampleNonProxy_nativeGetAutofillProfileGUIDs(
     JNIEnv* env,
     jclass jcaller) {
@@ -139,7 +140,7 @@ JNI_GENERATOR_EXPORT jobjectArray
 static base::android::ScopedJavaLocalRef<jstring> JNI_SampleNonProxy_GetDomainAndRegistry(JNIEnv*
     env, const base::android::JavaParamRef<jstring>& url);
 
-JNI_GENERATOR_EXPORT jstring Java_org_jni_1zero_samples_SampleNonProxy_nativeGetDomainAndRegistry(
+JNI_BOUNDARY_EXPORT jstring Java_org_jni_1zero_samples_SampleNonProxy_nativeGetDomainAndRegistry(
     JNIEnv* env,
     jclass jcaller,
     jstring url) {
@@ -149,7 +150,7 @@ JNI_GENERATOR_EXPORT jstring Java_org_jni_1zero_samples_SampleNonProxy_nativeGet
 
 static base::android::ScopedJavaLocalRef<jobject> JNI_SampleNonProxy_GetInnerClass(JNIEnv* env);
 
-JNI_GENERATOR_EXPORT jobject Java_org_jni_1zero_samples_SampleNonProxy_nativeGetInnerClass(
+JNI_BOUNDARY_EXPORT jobject Java_org_jni_1zero_samples_SampleNonProxy_nativeGetInnerClass(
     JNIEnv* env,
     jclass jcaller) {
   return JNI_SampleNonProxy_GetInnerClass(env).Release();
@@ -159,7 +160,7 @@ static base::android::ScopedJavaLocalRef<jbyteArray> JNI_SampleNonProxy_GetState
     env, const base::android::JavaParamRef<jobject>& jcaller,
     const base::android::JavaParamRef<jobject>& view);
 
-JNI_GENERATOR_EXPORT jbyteArray Java_org_jni_1zero_samples_SampleNonProxy_nativeGetStateAsByteArray(
+JNI_BOUNDARY_EXPORT jbyteArray Java_org_jni_1zero_samples_SampleNonProxy_nativeGetStateAsByteArray(
     JNIEnv* env,
     jobject jcaller,
     jobject view) {
@@ -174,7 +175,7 @@ static void JNI_SampleNonProxy_GotOrientation(JNIEnv* env, const
     jdouble beta,
     jdouble gamma);
 
-JNI_GENERATOR_EXPORT void Java_org_jni_1zero_samples_SampleNonProxy_nativeGotOrientation(
+JNI_BOUNDARY_EXPORT void Java_org_jni_1zero_samples_SampleNonProxy_nativeGotOrientation(
     JNIEnv* env,
     jobject jcaller,
     jint nativeDataFetcherImplAndroid,
@@ -188,7 +189,7 @@ JNI_GENERATOR_EXPORT void Java_org_jni_1zero_samples_SampleNonProxy_nativeGotOri
 static jint JNI_SampleNonProxy_Init(JNIEnv* env, const base::android::JavaParamRef<jobject>&
     jcaller);
 
-JNI_GENERATOR_EXPORT jint Java_org_jni_1zero_samples_SampleNonProxy_nativeInit(
+JNI_BOUNDARY_EXPORT jint Java_org_jni_1zero_samples_SampleNonProxy_nativeInit(
     JNIEnv* env,
     jobject jcaller) {
   return JNI_SampleNonProxy_Init(env, base::android::JavaParamRef<jobject>(env, jcaller));
@@ -197,7 +198,7 @@ JNI_GENERATOR_EXPORT jint Java_org_jni_1zero_samples_SampleNonProxy_nativeInit(
 static jint JNI_SampleNonProxy_Init(JNIEnv* env, const base::android::JavaParamRef<jobject>&
     jcaller);
 
-JNI_GENERATOR_EXPORT jint Java_org_jni_1zero_samples_SampleNonProxy_nativeInit(
+JNI_BOUNDARY_EXPORT jint Java_org_jni_1zero_samples_SampleNonProxy_nativeInit(
     JNIEnv* env,
     jobject jcaller) {
   return JNI_SampleNonProxy_Init(env, base::android::JavaParamRef<jobject>(env, jcaller));
@@ -207,7 +208,7 @@ static base::android::ScopedJavaLocalRef<jthrowable>
     JNI_SampleNonProxy_MessWithJavaException(JNIEnv* env, const
     base::android::JavaParamRef<jthrowable>& e);
 
-JNI_GENERATOR_EXPORT jthrowable
+JNI_BOUNDARY_EXPORT jthrowable
     Java_org_jni_1zero_samples_SampleNonProxy_nativeMessWithJavaException(
     JNIEnv* env,
     jclass jcaller,
@@ -224,7 +225,7 @@ static base::android::ScopedJavaLocalRef<jobject> JNI_SampleNonProxy_QueryBitmap
     const base::android::JavaParamRef<jobjectArray>& selectionArgs,
     const base::android::JavaParamRef<jstring>& sortOrder);
 
-JNI_GENERATOR_EXPORT jobject Java_org_jni_1zero_samples_SampleNonProxy_nativeQueryBitmap(
+JNI_BOUNDARY_EXPORT jobject Java_org_jni_1zero_samples_SampleNonProxy_nativeQueryBitmap(
     JNIEnv* env,
     jobject jcaller,
     jint nativeChromeBrowserProvider,
@@ -244,7 +245,7 @@ static void JNI_SampleNonProxy_SetRecognitionResults(JNIEnv* env, const
     jint sessionId,
     const base::android::JavaParamRef<jobjectArray>& results);
 
-JNI_GENERATOR_EXPORT void Java_org_jni_1zero_samples_SampleNonProxy_nativeSetRecognitionResults(
+JNI_BOUNDARY_EXPORT void Java_org_jni_1zero_samples_SampleNonProxy_nativeSetRecognitionResults(
     JNIEnv* env,
     jobject jcaller,
     jint sessionId,

third_party/jni_zero/golden/testPackagePrefixGenerator-SampleForTests_jni.h.golden

@@ -18,24 +18,24 @@
 
 // Step 1: Forward declarations.
 
-JNI_REGISTRATION_EXPORT extern const char
+JNI_ZERO_COMPONENT_BUILD_EXPORT extern const char
     kClassPath_this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests[];
 const char kClassPath_this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests[] =
     "this/is/a/package/prefix/org/jni_zero/samples/SampleForTests";
 
-JNI_REGISTRATION_EXPORT extern const char
+JNI_ZERO_COMPONENT_BUILD_EXPORT extern const char
     kClassPath_this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests_00024InnerStructA[];
 const char
     kClassPath_this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests_00024InnerStructA[] =
     "this/is/a/package/prefix/org/jni_zero/samples/SampleForTests$InnerStructA";
 
-JNI_REGISTRATION_EXPORT extern const char
+JNI_ZERO_COMPONENT_BUILD_EXPORT extern const char
     kClassPath_this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests_00024InnerStructB[];
 const char
     kClassPath_this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests_00024InnerStructB[] =
     "this/is/a/package/prefix/org/jni_zero/samples/SampleForTests$InnerStructB";
 // Leaking this jclass as we cannot use LazyInstance from some threads.
-JNI_REGISTRATION_EXPORT std::atomic<jclass>
+JNI_ZERO_COMPONENT_BUILD_EXPORT std::atomic<jclass>
     g_this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests_clazz(nullptr);
 #ifndef this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests_clazz_defined
 #define this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests_clazz_defined
@@ -46,7 +46,7 @@ inline jclass this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests_claz
 }
 #endif
 // Leaking this jclass as we cannot use LazyInstance from some threads.
-JNI_REGISTRATION_EXPORT std::atomic<jclass>
+JNI_ZERO_COMPONENT_BUILD_EXPORT std::atomic<jclass>
     g_this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests_00024InnerStructA_clazz(nullptr);
 #ifndef this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests_00024InnerStructA_clazz_defined
 #define this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests_00024InnerStructA_clazz_defined
@@ -59,7 +59,7 @@ inline jclass
 }
 #endif
 // Leaking this jclass as we cannot use LazyInstance from some threads.
-JNI_REGISTRATION_EXPORT std::atomic<jclass>
+JNI_ZERO_COMPONENT_BUILD_EXPORT std::atomic<jclass>
     g_this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests_00024InnerStructB_clazz(nullptr);
 #ifndef this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests_00024InnerStructB_clazz_defined
 #define this_is_a_package_prefix_org_jni_1zero_samples_SampleForTests_00024InnerStructB_clazz_defined
@@ -80,7 +80,7 @@ inline jclass
 namespace base {
 namespace android {
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForTests_1addStructB(
     JNIEnv* env,
     jclass jcaller,
@@ -93,7 +93,7 @@ JNI_GENERATOR_EXPORT void
       base::android::JavaParamRef<jobject>(env, b));
 }
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForTests_1destroy(
     JNIEnv* env,
     jclass jcaller,
@@ -107,7 +107,7 @@ JNI_GENERATOR_EXPORT void
 static base::android::ScopedJavaLocalRef<jclass> JNI_SampleForTests_GetClass(JNIEnv* env, const
     base::android::JavaParamRef<jclass>& arg0);
 
-JNI_GENERATOR_EXPORT jclass
+JNI_BOUNDARY_EXPORT jclass
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForTests_1getClass(
     JNIEnv* env,
     jclass jcaller,
@@ -118,7 +118,7 @@ JNI_GENERATOR_EXPORT jclass
 static jdouble JNI_SampleForTests_GetDoubleFunction(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& caller);
 
-JNI_GENERATOR_EXPORT jdouble
+JNI_BOUNDARY_EXPORT jdouble
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForTests_1getDoubleFunction(
     JNIEnv* env,
     jclass jcaller,
@@ -129,7 +129,7 @@ JNI_GENERATOR_EXPORT jdouble
 
 static jfloat JNI_SampleForTests_GetFloatFunction(JNIEnv* env);
 
-JNI_GENERATOR_EXPORT jfloat
+JNI_BOUNDARY_EXPORT jfloat
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForTests_1getFloatFunction(
     JNIEnv* env,
     jclass jcaller) {
@@ -139,7 +139,7 @@ JNI_GENERATOR_EXPORT jfloat
 static base::android::ScopedJavaLocalRef<jobject> JNI_SampleForTests_GetNonPODDatatype(JNIEnv* env,
     const base::android::JavaParamRef<jobject>& caller);
 
-JNI_GENERATOR_EXPORT jobject
+JNI_BOUNDARY_EXPORT jobject
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForTests_1getNonPODDatatype(
     JNIEnv* env,
     jclass jcaller,
@@ -151,7 +151,7 @@ JNI_GENERATOR_EXPORT jobject
 static base::android::ScopedJavaLocalRef<jthrowable> JNI_SampleForTests_GetThrowable(JNIEnv* env,
     const base::android::JavaParamRef<jthrowable>& arg0);
 
-JNI_GENERATOR_EXPORT jthrowable
+JNI_BOUNDARY_EXPORT jthrowable
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForTests_1getThrowable(
     JNIEnv* env,
     jclass jcaller,
@@ -164,7 +164,7 @@ static jlong JNI_SampleForTests_Init(JNIEnv* env, const base::android::JavaParam
     caller,
     const base::android::JavaParamRef<jstring>& param);
 
-JNI_GENERATOR_EXPORT jlong
+JNI_BOUNDARY_EXPORT jlong
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForTests_1init(
     JNIEnv* env,
     jclass jcaller,
@@ -174,7 +174,7 @@ JNI_GENERATOR_EXPORT jlong
       base::android::JavaParamRef<jstring>(env, param));
 }
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForTests_1iterateAndDoSomethingWithStructB(
     JNIEnv* env,
     jclass jcaller,
@@ -186,7 +186,7 @@ JNI_GENERATOR_EXPORT void
       caller));
 }
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForTests_1method(
     JNIEnv* env,
     jclass jcaller,
@@ -197,7 +197,7 @@ JNI_GENERATOR_EXPORT jint
   return native->Method(env, base::android::JavaParamRef<jobject>(env, caller));
 }
 
-JNI_GENERATOR_EXPORT jdouble
+JNI_BOUNDARY_EXPORT jdouble
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForTests_1methodOtherP0(
     JNIEnv* env,
     jclass jcaller,
@@ -208,7 +208,7 @@ JNI_GENERATOR_EXPORT jdouble
   return native->MethodOtherP0(env, base::android::JavaParamRef<jobject>(env, caller));
 }
 
-JNI_GENERATOR_EXPORT jstring
+JNI_BOUNDARY_EXPORT jstring
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForTests_1returnAString(
     JNIEnv* env,
     jclass jcaller,
@@ -223,7 +223,7 @@ static void JNI_SampleForTests_SetNonPODDatatype(JNIEnv* env, const
     base::android::JavaParamRef<jobject>& caller,
     const base::android::JavaParamRef<jobject>& rect);
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForTests_1setNonPODDatatype(
     JNIEnv* env,
     jclass jcaller,

third_party/jni_zero/golden/testPackagePrefixWithManualRegistration-Registration.h.golden

@@ -23,75 +23,75 @@
 
 // Step 2: Forward declarations (methods).
 
-JNI_GENERATOR_EXPORT jobject
+JNI_BOUNDARY_EXPORT jobject
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1bar(
     JNIEnv* env,
     jclass jcaller,
     jobject sample);
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1foo(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jboolean
+JNI_BOUNDARY_EXPORT jboolean
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1hasPhalange(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jclass
+JNI_BOUNDARY_EXPORT jclass
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnClass(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnClasses(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobject
+JNI_BOUNDARY_EXPORT jobject
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnObject(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnObjects(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jstring
+JNI_BOUNDARY_EXPORT jstring
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnString(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnStrings(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobject
+JNI_BOUNDARY_EXPORT jobject
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnStruct(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnStructs(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jthrowable
+JNI_BOUNDARY_EXPORT jthrowable
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnThrowable(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1returnThrowables(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jstring
+JNI_BOUNDARY_EXPORT jstring
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1revString(
     JNIEnv* env,
     jclass jcaller,
     jstring stringToReverse);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1sendSamplesToNative(
     JNIEnv* env,
     jclass jcaller,
     jobjectArray strs);
-JNI_GENERATOR_EXPORT jobjectArray
+JNI_BOUNDARY_EXPORT jobjectArray
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1sendToNative(
     JNIEnv* env,
     jclass jcaller,
     jobjectArray strs);
-JNI_GENERATOR_EXPORT jintArray
+JNI_BOUNDARY_EXPORT jintArray
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1testAllPrimitives(
     JNIEnv* env,
     jclass jcaller,
@@ -111,7 +111,7 @@ JNI_GENERATOR_EXPORT jintArray
     jfloatArray floats,
     jboolean zbool,
     jbooleanArray bools);
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI_this_1is_1a_1package_1prefix_1org_1jni_11zero_1samples_1SampleForAnnotationProcessor_1testSpecialTypes(
     JNIEnv* env,
     jclass jcaller,
@@ -211,7 +211,7 @@ static const JNINativeMethod kMethods_this_is_a_package_prefix_org_jni_1zero_GEN
 
 namespace {
 
-JNI_REGISTRATION_EXPORT bool RegisterNative_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI(JNIEnv* env) {
+JNI_ZERO_COMPONENT_BUILD_EXPORT bool RegisterNative_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI(JNIEnv* env) {
   const int number_of_methods = std::size(kMethods_this_is_a_package_prefix_org_jni_1zero_GEN_1JNI);
 
   base::android::ScopedJavaLocalRef<jclass> native_clazz =

third_party/jni_zero/golden/testPackagePrefixWithManualRegistrationWithProxyHash-Registration.h.golden

@@ -23,59 +23,59 @@
 
 // Step 2: Forward declarations (methods).
 
-JNI_GENERATOR_EXPORT jobject Java_this_is_a_package_prefix_J_N_MYJQG2tV(
+JNI_BOUNDARY_EXPORT jobject Java_this_is_a_package_prefix_J_N_MYJQG2tV(
     JNIEnv* env,
     jclass jcaller,
     jobject sample);
-JNI_GENERATOR_EXPORT void Java_this_is_a_package_prefix_J_N_McJTRQ4Z(
+JNI_BOUNDARY_EXPORT void Java_this_is_a_package_prefix_J_N_McJTRQ4Z(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jboolean Java_this_is_a_package_prefix_J_N_MmNHlL_000245(
+JNI_BOUNDARY_EXPORT jboolean Java_this_is_a_package_prefix_J_N_MmNHlL_000245(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jclass Java_this_is_a_package_prefix_J_N_MF_00024OWG3c(
+JNI_BOUNDARY_EXPORT jclass Java_this_is_a_package_prefix_J_N_MF_00024OWG3c(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MI7vvSXV(
+JNI_BOUNDARY_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MI7vvSXV(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobject Java_this_is_a_package_prefix_J_N_MQV6X3Sz(
+JNI_BOUNDARY_EXPORT jobject Java_this_is_a_package_prefix_J_N_MQV6X3Sz(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MntwrJje(
+JNI_BOUNDARY_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MntwrJje(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jstring Java_this_is_a_package_prefix_J_N_MlMyYIKk(
+JNI_BOUNDARY_EXPORT jstring Java_this_is_a_package_prefix_J_N_MlMyYIKk(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MQ631WBV(
+JNI_BOUNDARY_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MQ631WBV(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobject Java_this_is_a_package_prefix_J_N_M3fBDe9t(
+JNI_BOUNDARY_EXPORT jobject Java_this_is_a_package_prefix_J_N_M3fBDe9t(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MKFA0R1H(
+JNI_BOUNDARY_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MKFA0R1H(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jthrowable Java_this_is_a_package_prefix_J_N_M2vFJGXF(
+JNI_BOUNDARY_EXPORT jthrowable Java_this_is_a_package_prefix_J_N_M2vFJGXF(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MWuNxqXZ(
+JNI_BOUNDARY_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MWuNxqXZ(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jstring Java_this_is_a_package_prefix_J_N_MMV8vkvD(
+JNI_BOUNDARY_EXPORT jstring Java_this_is_a_package_prefix_J_N_MMV8vkvD(
     JNIEnv* env,
     jclass jcaller,
     jstring stringToReverse);
-JNI_GENERATOR_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MbvaHriB(
+JNI_BOUNDARY_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MbvaHriB(
     JNIEnv* env,
     jclass jcaller,
     jobjectArray strs);
-JNI_GENERATOR_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MBko4EWo(
+JNI_BOUNDARY_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MBko4EWo(
     JNIEnv* env,
     jclass jcaller,
     jobjectArray strs);
-JNI_GENERATOR_EXPORT jintArray Java_this_is_a_package_prefix_J_N_MTkl34Bi(
+JNI_BOUNDARY_EXPORT jintArray Java_this_is_a_package_prefix_J_N_MTkl34Bi(
     JNIEnv* env,
     jclass jcaller,
     jint zint,
@@ -94,7 +94,7 @@ JNI_GENERATOR_EXPORT jintArray Java_this_is_a_package_prefix_J_N_MTkl34Bi(
     jfloatArray floats,
     jboolean zbool,
     jbooleanArray bools);
-JNI_GENERATOR_EXPORT void Java_this_is_a_package_prefix_J_N_Mooq_13kI(
+JNI_BOUNDARY_EXPORT void Java_this_is_a_package_prefix_J_N_Mooq_13kI(
     JNIEnv* env,
     jclass jcaller,
     jclass clazz,
@@ -153,7 +153,7 @@ static const JNINativeMethod kMethods_this_is_a_package_prefix_J_N[] = {
 
 namespace {
 
-JNI_REGISTRATION_EXPORT bool RegisterNative_this_is_a_package_prefix_J_N(JNIEnv* env) {
+JNI_ZERO_COMPONENT_BUILD_EXPORT bool RegisterNative_this_is_a_package_prefix_J_N(JNIEnv* env) {
   const int number_of_methods = std::size(kMethods_this_is_a_package_prefix_J_N);
 
   base::android::ScopedJavaLocalRef<jclass> native_clazz =

third_party/jni_zero/golden/testPackagePrefixWithProxyHash-Registration.h.golden

@@ -23,59 +23,59 @@
 
 // Step 2: Forward declarations (methods).
 
-JNI_GENERATOR_EXPORT jobject Java_this_is_a_package_prefix_J_N_MYJQG2tV(
+JNI_BOUNDARY_EXPORT jobject Java_this_is_a_package_prefix_J_N_MYJQG2tV(
     JNIEnv* env,
     jclass jcaller,
     jobject sample);
-JNI_GENERATOR_EXPORT void Java_this_is_a_package_prefix_J_N_McJTRQ4Z(
+JNI_BOUNDARY_EXPORT void Java_this_is_a_package_prefix_J_N_McJTRQ4Z(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jboolean Java_this_is_a_package_prefix_J_N_MmNHlL_000245(
+JNI_BOUNDARY_EXPORT jboolean Java_this_is_a_package_prefix_J_N_MmNHlL_000245(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jclass Java_this_is_a_package_prefix_J_N_MF_00024OWG3c(
+JNI_BOUNDARY_EXPORT jclass Java_this_is_a_package_prefix_J_N_MF_00024OWG3c(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MI7vvSXV(
+JNI_BOUNDARY_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MI7vvSXV(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobject Java_this_is_a_package_prefix_J_N_MQV6X3Sz(
+JNI_BOUNDARY_EXPORT jobject Java_this_is_a_package_prefix_J_N_MQV6X3Sz(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MntwrJje(
+JNI_BOUNDARY_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MntwrJje(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jstring Java_this_is_a_package_prefix_J_N_MlMyYIKk(
+JNI_BOUNDARY_EXPORT jstring Java_this_is_a_package_prefix_J_N_MlMyYIKk(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MQ631WBV(
+JNI_BOUNDARY_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MQ631WBV(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobject Java_this_is_a_package_prefix_J_N_M3fBDe9t(
+JNI_BOUNDARY_EXPORT jobject Java_this_is_a_package_prefix_J_N_M3fBDe9t(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MKFA0R1H(
+JNI_BOUNDARY_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MKFA0R1H(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jthrowable Java_this_is_a_package_prefix_J_N_M2vFJGXF(
+JNI_BOUNDARY_EXPORT jthrowable Java_this_is_a_package_prefix_J_N_M2vFJGXF(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MWuNxqXZ(
+JNI_BOUNDARY_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MWuNxqXZ(
     JNIEnv* env,
     jclass jcaller);
-JNI_GENERATOR_EXPORT jstring Java_this_is_a_package_prefix_J_N_MMV8vkvD(
+JNI_BOUNDARY_EXPORT jstring Java_this_is_a_package_prefix_J_N_MMV8vkvD(
     JNIEnv* env,
     jclass jcaller,
     jstring stringToReverse);
-JNI_GENERATOR_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MbvaHriB(
+JNI_BOUNDARY_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MbvaHriB(
     JNIEnv* env,
     jclass jcaller,
     jobjectArray strs);
-JNI_GENERATOR_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MBko4EWo(
+JNI_BOUNDARY_EXPORT jobjectArray Java_this_is_a_package_prefix_J_N_MBko4EWo(
     JNIEnv* env,
     jclass jcaller,
     jobjectArray strs);
-JNI_GENERATOR_EXPORT jintArray Java_this_is_a_package_prefix_J_N_MTkl34Bi(
+JNI_BOUNDARY_EXPORT jintArray Java_this_is_a_package_prefix_J_N_MTkl34Bi(
     JNIEnv* env,
     jclass jcaller,
     jint zint,
@@ -94,7 +94,7 @@ JNI_GENERATOR_EXPORT jintArray Java_this_is_a_package_prefix_J_N_MTkl34Bi(
     jfloatArray floats,
     jboolean zbool,
     jbooleanArray bools);
-JNI_GENERATOR_EXPORT void Java_this_is_a_package_prefix_J_N_Mooq_13kI(
+JNI_BOUNDARY_EXPORT void Java_this_is_a_package_prefix_J_N_Mooq_13kI(
     JNIEnv* env,
     jclass jcaller,
     jclass clazz,

third_party/jni_zero/golden/testUniqueAnnotations-SampleUniqueAnnotations_jni.h.golden

@@ -18,12 +18,12 @@
 
 // Step 1: Forward declarations.
 
-JNI_REGISTRATION_EXPORT extern const char
+JNI_ZERO_COMPONENT_BUILD_EXPORT extern const char
     kClassPath_org_jni_1zero_samples_SampleUniqueAnnotations[];
 const char kClassPath_org_jni_1zero_samples_SampleUniqueAnnotations[] =
     "org/jni_zero/samples/SampleUniqueAnnotations";
 // Leaking this jclass as we cannot use LazyInstance from some threads.
-JNI_REGISTRATION_EXPORT std::atomic<jclass>
+JNI_ZERO_COMPONENT_BUILD_EXPORT std::atomic<jclass>
     g_org_jni_1zero_samples_SampleUniqueAnnotations_clazz(nullptr);
 #ifndef org_jni_1zero_samples_SampleUniqueAnnotations_clazz_defined
 #define org_jni_1zero_samples_SampleUniqueAnnotations_clazz_defined
@@ -41,7 +41,7 @@ inline jclass org_jni_1zero_samples_SampleUniqueAnnotations_clazz(JNIEnv* env) {
 static jint JNI_SampleUniqueAnnotations_Bar(JNIEnv* env, jint x,
     jint y);
 
-JNI_GENERATOR_EXPORT jint
+JNI_BOUNDARY_EXPORT jint
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleUniqueAnnotations_1bar(
     JNIEnv* env,
     jclass jcaller,
@@ -50,7 +50,7 @@ JNI_GENERATOR_EXPORT jint
   return JNI_SampleUniqueAnnotations_Bar(env, x, y);
 }
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_GEN_1JNI_org_1jni_11zero_1samples_1SampleUniqueAnnotations_1foo(
     JNIEnv* env,
     jclass jcaller,
@@ -60,7 +60,7 @@ JNI_GENERATOR_EXPORT void
   return native->Foo(env);
 }
 
-JNI_GENERATOR_EXPORT void
+JNI_BOUNDARY_EXPORT void
     Java_org_jni_1zero_samples_SampleUniqueAnnotations_nativeCallWithQualifiedObject(
     JNIEnv* env,
     jobject jcaller,

third_party/jni_zero/jni_export.h

@@ -0,0 +1,26 @@
+// Copyright 2023 The Chromium Authors
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "build/build_config.h"
+
+#ifndef JNI_ZERO_JNI_EXPORT_H_
+#define JNI_ZERO_JNI_EXPORT_H_
+
+#if defined(ARCH_CPU_X86)
+// Dalvik JIT generated code doesn't guarantee 16-byte stack alignment on
+// x86 - use force_align_arg_pointer to realign the stack at the JNI
+// boundary. crbug.com/655248
+#define JNI_BOUNDARY_EXPORT \
+  extern "C" __attribute__((visibility("default"), force_align_arg_pointer))
+#else
+#define JNI_BOUNDARY_EXPORT extern "C" __attribute__((visibility("default")))
+#endif
+
+#if defined(COMPONENT_BUILD)
+#define JNI_ZERO_COMPONENT_BUILD_EXPORT __attribute__((visibility("default")))
+#else
+#define JNI_ZERO_COMPONENT_BUILD_EXPORT
+#endif
+
+#endif  // JNI_ZERO_JNI_EXPORT_H_

third_party/jni_zero/jni_generator.py

@@ -421,7 +421,7 @@ extern const char kClassPath_${JAVA_CLASS}[];
 """)
     else:
       template = Template("""
-JNI_REGISTRATION_EXPORT extern const char kClassPath_${JAVA_CLASS}[];
+JNI_ZERO_COMPONENT_BUILD_EXPORT extern const char kClassPath_${JAVA_CLASS}[];
 const char kClassPath_${JAVA_CLASS}[] = \
 "${JNI_CLASS_PATH}";
 """)
@@ -452,7 +452,7 @@ extern std::atomic<jclass> g_${JAVA_CLASS}_clazz;
     else:
       template = Template("""\
 // Leaking this jclass as we cannot use LazyInstance from some threads.
-JNI_REGISTRATION_EXPORT std::atomic<jclass> g_${JAVA_CLASS}_clazz(nullptr);
+JNI_ZERO_COMPONENT_BUILD_EXPORT std::atomic<jclass> g_${JAVA_CLASS}_clazz(nullptr);
 """ + class_getter)
 
     for full_clazz in classes.values():
@@ -672,7 +672,7 @@ $METHOD_STUBS
           'P0_TYPE': native.first_param_cpp_type,
       })
       template = Template("""\
-JNI_GENERATOR_EXPORT ${RETURN} ${STUB_NAME}(
+JNI_BOUNDARY_EXPORT ${RETURN} ${STUB_NAME}(
     JNIEnv* env,
     ${PARAMS_IN_STUB}) {
   ${P0_TYPE}* native = reinterpret_cast<${P0_TYPE}*>(${PARAM0_NAME});
@@ -686,7 +686,7 @@ JNI_GENERATOR_EXPORT ${RETURN} ${STUB_NAME}(
       template = Template("""\
 static ${RETURN_DECLARATION} ${IMPL_METHOD_NAME}(JNIEnv* env${PARAMS});
 
-JNI_GENERATOR_EXPORT ${RETURN} ${STUB_NAME}(
+JNI_BOUNDARY_EXPORT ${RETURN} ${STUB_NAME}(
     JNIEnv* env,
     ${PARAMS_IN_STUB}) {
   return ${IMPL_METHOD_NAME}(${PARAMS_IN_CALL})${POST_CALL};

third_party/jni_zero/jni_registration_generator.py

@@ -240,7 +240,7 @@ def _GenerateStubs(natives):
 
 def _AddForwardingCalls(signature_to_cases, short_gen_jni_class):
   template = string.Template("""
-JNI_GENERATOR_EXPORT ${RETURN} Java_${CLASS_NAME}_${PROXY_SIGNATURE}(
+JNI_BOUNDARY_EXPORT ${RETURN} Java_${CLASS_NAME}_${PROXY_SIGNATURE}(
     JNIEnv* env,
     jclass jcaller,
     ${PARAMS_IN_STUB}) {
@@ -286,7 +286,7 @@ ${KMETHODS}
 
 namespace {
 
-JNI_REGISTRATION_EXPORT bool ${REGISTRATION_NAME}(JNIEnv* env) {
+JNI_ZERO_COMPONENT_BUILD_EXPORT bool ${REGISTRATION_NAME}(JNIEnv* env) {
   const int number_of_methods = std::size(kMethods_${ESCAPED_PROXY_CLASS});
 
   base::android::ScopedJavaLocalRef<jclass> native_clazz =
@@ -538,7 +538,7 @@ class DictionaryGenerator(object):
   def _AddForwardDeclaration(self):
     """Add the content of the forward declaration to the dictionary."""
     template = string.Template("""\
-JNI_GENERATOR_EXPORT ${RETURN} ${STUB_NAME}(
+JNI_BOUNDARY_EXPORT ${RETURN} ${STUB_NAME}(
     JNIEnv* env,
     ${PARAMS_IN_STUB});
 """)
@@ -680,7 +680,7 @@ ${KMETHODS}
     if not natives:
       return ''
     template = string.Template("""\
-JNI_REGISTRATION_EXPORT bool ${REGISTER_NAME}(JNIEnv* env) {
+JNI_ZERO_COMPONENT_BUILD_EXPORT bool ${REGISTER_NAME}(JNIEnv* env) {
 ${NATIVES}\
   return true;
 }

third_party/jni_zero/jni_zero_helper.h

@@ -9,11 +9,11 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
-#include "base/base_export.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/raw_ptr.h"
 #include "build/build_config.h"
+#include "third_party/jni_zero/jni_export.h"
 #include "third_party/jni_zero/jni_int_wrapper.h"
 
 // Project-specific macros used by the header files generated by
@@ -24,23 +24,6 @@
 
 #define CHECK_CLAZZ(env, jcaller, clazz, ...) DCHECK(clazz);
 
-#if defined(ARCH_CPU_X86)
-// Dalvik JIT generated code doesn't guarantee 16-byte stack alignment on
-// x86 - use force_align_arg_pointer to realign the stack at the JNI
-// boundary. crbug.com/655248
-#define JNI_GENERATOR_EXPORT \
-  extern "C" __attribute__((visibility("default"), force_align_arg_pointer))
-#else
-#define JNI_GENERATOR_EXPORT extern "C" __attribute__((visibility("default")))
-#endif
-
-// Used to export JNI registration functions.
-#if defined(COMPONENT_BUILD)
-#define JNI_REGISTRATION_EXPORT __attribute__((visibility("default")))
-#else
-#define JNI_REGISTRATION_EXPORT
-#endif
-
 namespace jni_generator {
 
 inline void HandleRegistrationError(JNIEnv* env,
@@ -58,7 +41,7 @@ inline void CheckException(JNIEnv* env) {
 constexpr uint64_t kJniStackMarkerValue = 0xbdbdef1bebcade1b;
 
 // Context about the JNI call with exception checked to be stored in stack.
-struct BASE_EXPORT JniJavaCallContextUnchecked {
+struct JNI_ZERO_COMPONENT_BUILD_EXPORT JniJavaCallContextUnchecked {
   ALWAYS_INLINE JniJavaCallContextUnchecked() {
 // TODO(ssid): Implement for other architectures.
 #if defined(__arm__) || defined(__aarch64__)
@@ -101,7 +84,7 @@ struct BASE_EXPORT JniJavaCallContextUnchecked {
 };
 
 // Context about the JNI call with exception unchecked to be stored in stack.
-struct BASE_EXPORT JniJavaCallContextChecked {
+struct JNI_ZERO_COMPONENT_BUILD_EXPORT JniJavaCallContextChecked {
   // Force no inline to reduce code size.
   template <base::android::MethodID::Type type>
   NOINLINE void Init(JNIEnv* env,