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}
chromium · Oct 19, 2023 · 2d208bd · 2d208bd
1 parent 4879ca1
commit 2d208bd
Show file tree

Hide file tree

Showing 45 changed files with 488 additions and 462 deletions.
diff --git a/base/BUILD.gn b/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",
     ]
   }
 

diff --git a/base/android/linker/BUILD.gn b/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" ]

diff --git a/base/android/linker/DEPS b/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

diff --git a/base/android/linker/linker_jni.cc b/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) {

diff --git a/base/android/linker/linker_jni.h b/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__)

diff --git a/chrome/android/modules/cablev2_authenticator/internal/BUILD.gn b/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.

diff --git a/chrome/android/modules/cablev2_authenticator/internal/entrypoints.cc b/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;
   }

diff --git a/chrome/android/modules/stack_unwinder/internal/BUILD.gn b/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.

diff --git a/chrome/android/modules/stack_unwinder/internal/entrypoints.cc b/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;
   }

diff --git a/chrome/android/modules/test_dummy/internal/BUILD.gn b/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.

diff --git a/chrome/android/modules/test_dummy/internal/entrypoints.cc b/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;
   }

diff --git a/chrome/browser/ui/BUILD.gn b/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",
     ]

diff --git a/chrome/browser/vr/BUILD.gn b/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) {

diff --git a/chrome/browser/vr/jni_onload.cc b/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;
 }
diff --git a/chromecast/android/BUILD.gn b/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" ]

diff --git a/chromecast/app/android/cast_browser_module_entrypoint.cc b/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;

diff --git a/components/permissions/BUILD.gn b/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",
     ]

diff --git a/content/browser/BUILD.gn b/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",

diff --git a/docs/android_dynamic_feature_modules.md b/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;
   }

diff --git a/third_party/cardboard/BUILD.gn b/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",
   ]