From 5f497ca302711e19eafa35f5ee00a8601695c6cb Mon Sep 17 00:00:00 2001 From: Jakub Grzmiel Date: Thu, 8 Mar 2018 00:09:49 -0800 Subject: [PATCH] Convert constant with build flags to function Reviewed By: ttsugriy Differential Revision: D7184372 fbshipit-source-id: c66f473ad15898532f24c6276898ab250e749744 --- ReactCommon/cxxreact/BUCK | 8 ++++---- ReactCommon/fabric/BUCK | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ReactCommon/cxxreact/BUCK b/ReactCommon/cxxreact/BUCK index 24d1d421e..5f84b3fd5 100644 --- a/ReactCommon/cxxreact/BUCK +++ b/ReactCommon/cxxreact/BUCK @@ -1,4 +1,4 @@ -load("@xplat//configurations/buck/apple:flag_defs.bzl", "DEBUG_PREPROCESSOR_FLAGS") +load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "rn_xplat_cxx_library", "ANDROID_INSPECTOR_FLAGS", "APPLE_INSPECTOR_FLAGS", "ANDROID_JSC_DEPS", "APPLE_JSC_DEPS", "react_native_xplat_target") CXX_LIBRARY_COMPILER_FLAGS = [ @@ -9,8 +9,8 @@ CXX_LIBRARY_COMPILER_FLAGS = [ APPLE_COMPILER_FLAGS = [] if not IS_OSS_BUILD: - load("@xplat//configurations/buck/apple:flag_defs.bzl", "STATIC_LIBRARY_IOS_FLAGS", "flags") - APPLE_COMPILER_FLAGS = flags.get_flag_value(STATIC_LIBRARY_IOS_FLAGS, 'compiler_flags') + load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_static_library_ios_flags", "flags") + APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), 'compiler_flags') rn_xplat_cxx_library( name = "module", @@ -139,7 +139,7 @@ rn_xplat_cxx_library( fbobjc_frameworks = [ "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework", ], - fbobjc_preprocessor_flags = DEBUG_PREPROCESSOR_FLAGS + APPLE_INSPECTOR_FLAGS, + fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + APPLE_INSPECTOR_FLAGS, force_static = True, preprocessor_flags = [ "-DLOG_TAG=\"ReactNative\"", diff --git a/ReactCommon/fabric/BUCK b/ReactCommon/fabric/BUCK index 4fcbe82b5..fcf321eae 100644 --- a/ReactCommon/fabric/BUCK +++ b/ReactCommon/fabric/BUCK @@ -1,4 +1,4 @@ -load("@xplat//configurations/buck/apple:flag_defs.bzl", "DEBUG_PREPROCESSOR_FLAGS") +load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_debug_preprocessor_flags") load("//ReactNative:DEFS.bzl", "IS_OSS_BUILD", "rn_xplat_cxx_library", "APPLE_INSPECTOR_FLAGS") CXX_LIBRARY_COMPILER_FLAGS = [ @@ -9,8 +9,8 @@ CXX_LIBRARY_COMPILER_FLAGS = [ APPLE_COMPILER_FLAGS = [] if not IS_OSS_BUILD: - load("@xplat//configurations/buck/apple:flag_defs.bzl", "STATIC_LIBRARY_IOS_FLAGS", "flags") - APPLE_COMPILER_FLAGS = flags.get_flag_value(STATIC_LIBRARY_IOS_FLAGS, 'compiler_flags') + load("@xplat//configurations/buck/apple:flag_defs.bzl", "get_static_library_ios_flags", "flags") + APPLE_COMPILER_FLAGS = flags.get_flag_value(get_static_library_ios_flags(), 'compiler_flags') rn_xplat_cxx_library( name = "fabric", @@ -27,7 +27,7 @@ rn_xplat_cxx_library( "-frtti", ], fbobjc_compiler_flags = APPLE_COMPILER_FLAGS, - fbobjc_preprocessor_flags = DEBUG_PREPROCESSOR_FLAGS + APPLE_INSPECTOR_FLAGS, + fbobjc_preprocessor_flags = get_debug_preprocessor_flags() + APPLE_INSPECTOR_FLAGS, force_static = True, preprocessor_flags = [ "-DLOG_TAG=\"ReactNative\"",