Skip to content

Commit

Permalink
Combine rn_debug_flags and rn_feature_flags
Browse files Browse the repository at this point in the history
Summary:
@public
Both of these are used for turning BUCK configs and build mode into compiler flags, so we should combine them to avoid confusion on where they are to be used.

Reviewed By: fkgozali

Differential Revision: D17262579

fbshipit-source-id: d145374fd619068f794018d79111720d30f6269c
  • Loading branch information
Mehdi Mulani authored and facebook-github-bot committed Sep 12, 2019
1 parent 3e02f1f commit 8831cc6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 7 deletions.
6 changes: 3 additions & 3 deletions React/CoreModules/BUCK
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@fbsource//tools/build_defs/apple:flag_defs.bzl", "OBJC_ARC_PREPROCESSOR_FLAGS", "get_debug_preprocessor_flags", "get_fbobjc_enable_exception_lang_compiler_flags_DEPRECATED")
load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "rn_apple_library", "rn_debug_flags")
load("@fbsource//tools/build_defs/oss:rn_defs.bzl", "rn_apple_library", "rn_extra_build_flags")
load(
"@fbsource//xplat/configurations/buck/apple/plugins/sad_xplat_hosted_configurations:react_module_registration.bzl",
"react_module_plugin_providers",
Expand All @@ -25,7 +25,7 @@ rn_apple_library(
"-weak_framework",
"WebKit",
],
exported_preprocessor_flags = rn_debug_flags(),
exported_preprocessor_flags = rn_extra_build_flags(),
frameworks = [
"Foundation",
"UIKit",
Expand Down Expand Up @@ -61,7 +61,7 @@ rn_apple_library(
name = "PlatformConstants",
native_class_func = "RCTPlatformCls",
),
preprocessor_flags = OBJC_ARC_PREPROCESSOR_FLAGS + get_debug_preprocessor_flags() + rn_debug_flags() + [
preprocessor_flags = OBJC_ARC_PREPROCESSOR_FLAGS + get_debug_preprocessor_flags() + rn_extra_build_flags() + [
"-DRN_DISABLE_OSS_PLUGIN_HEADER",
],
reexport_all_header_dependencies = True,
Expand Down
5 changes: 1 addition & 4 deletions tools/build_defs/oss/rn_defs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,7 @@ def react_native_dep(path):
def react_native_xplat_dep(path):
return "//ReactCommon/" + path

def rn_debug_flags():
return []

def rn_feature_flags():
def rn_extra_build_flags():
return []

# React property preprocessor
Expand Down

0 comments on commit 8831cc6

Please sign in to comment.