diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK index 14aa2e3c999..515ff8cb35d 100644 --- a/ReactCommon/cxxreact/BUCK +++ b/ReactCommon/cxxreact/BUCK @@ -1,5 +1,4 @@ -load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags") -load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "rn_xplat_cxx_library", "get_android_inspector_flags", "get_apple_inspector_flags", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "react_native_xplat_target") +load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "rn_xplat_cxx_library", "get_android_inspector_flags", "get_apple_inspector_flags", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "react_native_xplat_target", "ANDROID", "APPLE") CXX_LIBRARY_COMPILER_FLAGS = [ "-std=c++14", @@ -8,9 +7,12 @@ CXX_LIBRARY_COMPILER_FLAGS = [ APPLE_COMPILER_FLAGS = [] +DEBUG_PREPROCESSOR_FLAGS = [] + if not IS_OSS_BUILD: - load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_static_library_ios_flags", "flags") + load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags", "get_static_library_ios_flags", "flags") APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), 'compiler_flags') + DEBUG_PREPROCESSOR_FLAGS = get_debug_preprocessor_flags() rn_xplat_cxx_library( name = "module", @@ -140,7 +142,7 @@ rn_xplat_cxx_library( fbobjc_frameworks = [ "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework", ], - fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + get_apple_inspector_flags(), + fbobjc_preprocessor_flags = DEBUG_PREPROCESSOR_FLAGS + get_apple_inspector_flags(), force_static = True, macosx_tests_override = [], platforms = (ANDROID, APPLE), diff --git a/ReactCommon/jschelpers/BUCK b/ReactCommon/jschelpers/BUCK index 37dc1abb0df..c0bb888ea0c 100644 --- a/ReactCommon/jschelpers/BUCK +++ b/ReactCommon/jschelpers/BUCK @@ -1,4 +1,4 @@ -load("//ReactNative:DEFS.bzl", "rn_xplat_cxx_library", "react_native_xplat_target", "ANDROID_JSC_INTERNAL_DEPS", "APPLE_JSC_INTERNAL_DEPS") +load("//ReactNative:DEFS.bzl", "rn_xplat_cxx_library", "react_native_xplat_target", "ANDROID_JSC_INTERNAL_DEPS", "APPLE_JSC_INTERNAL_DEPS", "ANDROID", "APPLE") EXPORTED_HEADERS = [ "JavaScriptCore.h", diff --git a/ReactNative/DEFS.bzl b/ReactNative/DEFS.bzl index 135bacfbc93..b0c85a1aaf7 100644 --- a/ReactNative/DEFS.bzl +++ b/ReactNative/DEFS.bzl @@ -4,7 +4,7 @@ This lets us build React Native: - At Facebook by running buck from the root of the fb repo - Outside of Facebook by running buck in the root of the git repo """ -# @lint-ignore-every SKYLINT +# @lint-ignore-every SKYLINT BUCKRESTRICTEDSYNTAX IS_OSS_BUILD = True @@ -22,6 +22,7 @@ ANDROID_JSC_INTERNAL_DEPS = [ ] ANDROID_JSC_DEPS = ANDROID_JSC_INTERNAL_DEPS ANDROID = "Android" +APPLE = "" YOGA_TARGET = '//ReactAndroid/src/main/java/com/facebook:yoga' FBGLOGINIT_TARGET = '//ReactAndroid/src/main/jni/first-party/fbgloginit:fbgloginit' @@ -33,6 +34,14 @@ with allow_unsafe_import(): import os +def get_apple_inspector_flags(): + return [] + + +def get_android_inspector_flags(): + return [] + + # Building is not supported in OSS right now def rn_xplat_cxx_library(name, **kwargs): new_kwargs = {