From e3a591e65092e0c9c6eeb3f91881a70ddfa102ed Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Tue, 30 Nov 2021 06:48:30 -0800 Subject: [PATCH] Enable allow_jni_merging for internal targets Summary: Noticed we explicitly dropped the `allow_jni_merging` while not actually using it anywhere, and that we didn't have `fbandroid_allow_jni_merging` on some other libs. Changelog: [Internal] Reviewed By: RSNara Differential Revision: D32355868 fbshipit-source-id: 6bd3fcc395e3dcacf4a8fc1033d471b2ffb0e8af --- .../src/main/java/com/facebook/hermes/instrumentation/BUCK | 1 + .../src/main/java/com/facebook/react/turbomodule/core/jni/BUCK | 1 + tools/build_defs/oss/rn_defs.bzl | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK index ead8aae637e..239cf64ce75 100644 --- a/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/hermes/instrumentation/BUCK @@ -33,6 +33,7 @@ rn_xplat_cxx_library( header_namespace = "", compiler_flags_enable_exceptions = True, # TODO: is this necessary? compiler_flags_enable_rtti = True, # TODO: is this necessary? + fbandroid_allow_jni_merging = True, labels = ["supermodule:xplat/default/public.react_native.infra"], platforms = ANDROID, soname = "libjsijniprofiler.$(ext)", diff --git a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK index 4291e2ae40f..448c7a47d92 100644 --- a/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK +++ b/ReactAndroid/src/main/java/com/facebook/react/turbomodule/core/jni/BUCK @@ -11,6 +11,7 @@ rn_xplat_cxx_library( "ReactCommon/TurboModuleManager.h": "ReactCommon/TurboModuleManager.h", "ReactCommon/TurboModuleManagerDelegate.h": "ReactCommon/TurboModuleManagerDelegate.h", }, + fbandroid_allow_jni_merging = True, labels = ["supermodule:xplat/default/public.react_native.infra"], platforms = ANDROID, preprocessor_flags = [ diff --git a/tools/build_defs/oss/rn_defs.bzl b/tools/build_defs/oss/rn_defs.bzl index 492fc2082dd..4bcd40bc08f 100644 --- a/tools/build_defs/oss/rn_defs.bzl +++ b/tools/build_defs/oss/rn_defs.bzl @@ -274,8 +274,7 @@ def rn_robolectric_test(name, srcs, vm_args = None, *args, **kwargs): **kwargs ) -def cxx_library(allow_jni_merging = None, **kwargs): - _ignore = allow_jni_merging +def cxx_library(**kwargs): args = { k: v for k, v in kwargs.items()