From ddfcaf96bcea0d08f89afe7d340be4a5f23679ce Mon Sep 17 00:00:00 2001 From: Jonathan Kim Date: Tue, 20 Mar 2018 14:37:57 -0700 Subject: [PATCH] Drop fb{android|objc} prefixed keys for oss builds Reviewed By: hramos Differential Revision: D7329425 fbshipit-source-id: 8a2e5936991f99b0d5112a6940856e8ee1d32a55 --- ReactNative/DEFS.bzl | 38 +++++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 17 deletions(-) diff --git a/ReactNative/DEFS.bzl b/ReactNative/DEFS.bzl index 8842ed74f..b84007444 100644 --- a/ReactNative/DEFS.bzl +++ b/ReactNative/DEFS.bzl @@ -34,8 +34,12 @@ with allow_unsafe_import(): # Building is not supported in OSS right now -def rn_xplat_cxx_library(name, platforms = None, **kwargs): - cxx_library(name=name, **kwargs) +def rn_xplat_cxx_library(name, **kwargs): + _ignore = kwargs + native.cxx_library( + name=name, + visibility=kwargs.get("visibility", []) + ) # Example: react_native_target('java/com/facebook/react/common:common') @@ -89,39 +93,39 @@ def rn_android_library(name, deps=[], plugins=[], *args, **kwargs): plugins = list(set(plugins + react_module_plugins)) - android_library(name=name, deps=deps, plugins=plugins, *args, **kwargs) + native.android_library(name=name, deps=deps, plugins=plugins, *args, **kwargs) def rn_android_binary(*args, **kwargs): - android_binary(*args, **kwargs) + native.android_binary(*args, **kwargs) def rn_android_build_config(*args, **kwargs): - android_build_config(*args, **kwargs) + native.android_build_config(*args, **kwargs) def rn_android_resource(*args, **kwargs): - android_resource(*args, **kwargs) + native.android_resource(*args, **kwargs) def rn_android_prebuilt_aar(*args, **kwargs): - android_prebuilt_aar(*args, **kwargs) + native.android_prebuilt_aar(*args, **kwargs) def rn_java_library(*args, **kwargs): - java_library(*args, **kwargs) + native.java_library(*args, **kwargs) def rn_java_annotation_processor(*args, **kwargs): - java_annotation_processor(*args, **kwargs) + native.java_annotation_processor(*args, **kwargs) def rn_prebuilt_native_library(*args, **kwargs): - prebuilt_native_library(*args, **kwargs) + native.prebuilt_native_library(*args, **kwargs) def rn_prebuilt_jar(*args, **kwargs): - prebuilt_jar(*args, **kwargs) + native.prebuilt_jar(*args, **kwargs) def rn_robolectric_test(name, srcs, vm_args=None, *args, **kwargs): @@ -166,10 +170,10 @@ def rn_robolectric_test(name, srcs, vm_args=None, *args, **kwargs): ) -original_cxx_library = cxx_library - - def cxx_library(allow_jni_merging=None, **kwargs): - kwargs.pop('fbandroid_deps', []) - kwargs.pop('fbobjc_deps', []) - original_cxx_library(**kwargs) + args = { + k: v + for k, v in kwargs.items() + if not (k.startswith("fbandroid_") or k.startswith("fbobjc_")) + } + native.cxx_library(**args)