Fixing up header namespaces in ReactCommon

Reviewed By: mzlee

Differential Revision: D5079295

fbshipit-source-id: 03b848dedb41da900bb6ac69112bbb973a8a2595
This commit is contained in:
Ashok Menon 2017-05-17 14:20:35 -07:00 committed by Facebook Github Bot
parent 1e32de0304
commit 056d075ef2
2 changed files with 30 additions and 18 deletions

View File

@ -12,14 +12,16 @@ if THIS_IS_FBOBJC:
rn_xplat_cxx_library( rn_xplat_cxx_library(
name = "module", name = "module",
compiler_flags = CXX_LIBRARY_COMPILER_FLAGS, compiler_flags = CXX_LIBRARY_COMPILER_FLAGS,
exported_headers = [ exported_headers = subdir_glob(
"CxxModule.h", [
"JsArgumentHelpers.h", ("", "CxxModule.h"),
"JsArgumentHelpers-inl.h", ("", "JsArgumentHelpers.h"),
], ("", "JsArgumentHelpers-inl.h"),
fbobjc_header_path_prefix = "cxxreact", ],
prefix = "cxxreact",
),
force_static = True, force_static = True,
header_namespace = "cxxreact", header_namespace = "",
visibility = [ visibility = [
"PUBLIC", "PUBLIC",
], ],
@ -38,12 +40,12 @@ rn_xplat_cxx_library(
"-fexceptions", "-fexceptions",
"-frtti", "-frtti",
], ],
exported_headers = [ exported_headers = subdir_glob(
"JSBigString.h", [("", "JSBigString.h")],
], prefix = "cxxreact",
fbobjc_header_path_prefix = "cxxreact", ),
force_static = True, force_static = True,
header_namespace = "cxxreact", header_namespace = "",
visibility = [ visibility = [
"PUBLIC", "PUBLIC",
], ],
@ -106,7 +108,13 @@ rn_xplat_cxx_library(
"-fexceptions", "-fexceptions",
"-frtti", "-frtti",
], ],
exported_headers = CXXREACT_PUBLIC_HEADERS, exported_headers = dict([
(
"cxxreact/%s" % header,
header,
)
for header in CXXREACT_PUBLIC_HEADERS
]),
fbandroid_preprocessor_flags = [ fbandroid_preprocessor_flags = [
"-DWITH_JSC_EXTRA_TRACING=1", "-DWITH_JSC_EXTRA_TRACING=1",
"-DWITH_JSC_MEMORY_PRESSURE=1", "-DWITH_JSC_MEMORY_PRESSURE=1",
@ -132,12 +140,11 @@ rn_xplat_cxx_library(
fbobjc_frameworks = [ fbobjc_frameworks = [
"$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework", "$SDKROOT/System/Library/Frameworks/JavaScriptCore.framework",
], ],
fbobjc_header_path_prefix = "cxxreact",
fbobjc_inherited_buck_flags = STATIC_LIBRARY_IOS_FLAGS, fbobjc_inherited_buck_flags = STATIC_LIBRARY_IOS_FLAGS,
fbobjc_preprocessor_flags = DEBUG_PREPROCESSOR_FLAGS, fbobjc_preprocessor_flags = DEBUG_PREPROCESSOR_FLAGS,
fbobjc_visibility = ["PUBLIC"], fbobjc_visibility = ["PUBLIC"],
force_static = True, force_static = True,
header_namespace = "cxxreact", header_namespace = "",
headers = glob( headers = glob(
["*.h"], ["*.h"],
excludes = CXXREACT_PUBLIC_HEADERS, excludes = CXXREACT_PUBLIC_HEADERS,

View File

@ -22,11 +22,16 @@ rn_xplat_cxx_library(
"-fvisibility=hidden", "-fvisibility=hidden",
"-std=c++1y", "-std=c++1y",
], ],
exported_headers = EXPORTED_HEADERS, exported_headers = dict([
fbobjc_header_path_prefix = "jschelpers", (
"jschelpers/%s" % header,
header,
)
for header in EXPORTED_HEADERS
]),
fbobjc_inherited_buck_flags = STATIC_LIBRARY_IOS_FLAGS, fbobjc_inherited_buck_flags = STATIC_LIBRARY_IOS_FLAGS,
force_static = True, force_static = True,
header_namespace = "jschelpers", header_namespace = "",
headers = glob( headers = glob(
["*.h"], ["*.h"],
excludes = EXPORTED_HEADERS, excludes = EXPORTED_HEADERS,