Fix Travis CI runs

Summary: Closes https://github.com/facebook/react-native/pull/14286

Differential Revision: D5164925

Pulled By: javache

fbshipit-source-id: 0ebe028ab58f37a9afc8b615fe346d7af9180040
This commit is contained in:
Pieter De Baets
2017-06-02 08:55:32 -07:00
committed by Facebook Github Bot
parent 53169b0de3
commit 79500f81a9
6 changed files with 62 additions and 49 deletions

View File

@@ -1,33 +1,32 @@
include_defs("//ReactAndroid/DEFS")
if not IS_OSS_BUILD:
cxx_library(
name = "jni",
srcs = glob(["*.cpp"]),
compiler_flags = [
"-Wall",
"-Werror",
"-fexceptions",
"-std=c++1y",
"-frtti",
],
header_namespace = "",
headers = glob(
["*.h"],
),
preprocessor_flags = [
"-DLOG_TAG=\"PackagerConnectionJNI\"",
"-DWITH_FBSYSTRACE=1",
"-DWITH_INSPECTOR=1",
],
soname = "libpackagerconnectionjnifb.$(ext)",
visibility = [
"PUBLIC",
],
xcode_public_headers_symlinks = True,
deps = JSC_DEPS + [
FBJNI_TARGET,
"//xplat/folly:molly",
react_native_xplat_target("jschelpers:jschelpers"),
]
)
cxx_library(
name = "jni",
srcs = glob(["*.cpp"]),
headers = glob(
["*.h"],
),
header_namespace = "",
compiler_flags = [
"-Wall",
"-Werror",
"-fexceptions",
"-std=c++1y",
"-frtti",
],
preprocessor_flags = [
"-DLOG_TAG=\"PackagerConnectionJNI\"",
"-DWITH_FBSYSTRACE=1",
"-DWITH_INSPECTOR=1",
],
soname = "libpackagerconnectionjnifb.$(ext)",
visibility = [
"PUBLIC",
],
xcode_public_headers_symlinks = True,
deps = ([
FBJNI_TARGET,
"//xplat/folly:molly",
react_native_xplat_target("jschelpers:jschelpers"),
] + JSC_DEPS) if not IS_OSS_BUILD else [],
)

View File

@@ -20,6 +20,12 @@ EXPORTED_HEADERS = [
cxx_library(
name = "jni",
srcs = glob(["*.cpp"]),
headers = glob(
["*.h"],
excludes = EXPORTED_HEADERS,
),
header_namespace = "react/jni",
exported_headers = EXPORTED_HEADERS,
compiler_flags = [
"-Wall",
"-Werror",
@@ -29,12 +35,6 @@ cxx_library(
"-Wno-pessimizing-move",
"-Wno-inconsistent-missing-override",
],
exported_headers = EXPORTED_HEADERS,
header_namespace = "react/jni",
headers = glob(
["*.h"],
excludes = EXPORTED_HEADERS,
),
preprocessor_flags = [
"-DLOG_TAG=\"ReactNativeJNI\"",
"-DWITH_FBSYSTRACE=1",
@@ -45,7 +45,7 @@ cxx_library(
"PUBLIC",
],
xcode_public_headers_symlinks = True,
deps = JSC_DEPS + [
deps = ([
"//native/third-party/android-ndk:android",
"//xplat/folly:molly",
"//xplat/fbgloginit:fbgloginit",
@@ -53,5 +53,5 @@ cxx_library(
react_native_xplat_target("cxxreact:bridge"),
react_native_xplat_target("cxxreact:module"),
FBJNI_TARGET,
],
] + JSC_DEPS) if not IS_OSS_BUILD else [],
)