From 6e2c07534e3fb8381c87c567650ce5184c5511f5 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Fri, 12 May 2017 08:18:11 -0700 Subject: [PATCH] Fix Circle CI builds Summary: Closes https://github.com/facebook/react-native/pull/13945 Differential Revision: D5052083 Pulled By: javache fbshipit-source-id: eeda8253d26c2dfd0d20b93b238377fe92e3ca3c --- ReactAndroid/src/main/jni/packagerconnection/BUCK | 7 ++----- ReactAndroid/src/main/jni/xreact/jni/BUCK | 2 +- ReactCommon/DEFS | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/ReactAndroid/src/main/jni/packagerconnection/BUCK b/ReactAndroid/src/main/jni/packagerconnection/BUCK index 1572a253f6..2f0debd6fb 100644 --- a/ReactAndroid/src/main/jni/packagerconnection/BUCK +++ b/ReactAndroid/src/main/jni/packagerconnection/BUCK @@ -25,11 +25,8 @@ cxx_library( ], xcode_public_headers_symlinks = True, deps = JSC_DEPS + [ - "//native/fb:fb", - "//native/third-party/android-ndk:android", + FBJNI_TARGET, "//xplat/folly:molly", - "//xplat/fbgloginit:fbgloginit", - "//xplat/fbsystrace:fbsystrace", react_native_xplat_target("jschelpers:jschelpers"), - ], + ] if not IS_OSS_BUILD else [], ) diff --git a/ReactAndroid/src/main/jni/xreact/jni/BUCK b/ReactAndroid/src/main/jni/xreact/jni/BUCK index 7be5ded187..c2109fa9f8 100644 --- a/ReactAndroid/src/main/jni/xreact/jni/BUCK +++ b/ReactAndroid/src/main/jni/xreact/jni/BUCK @@ -46,12 +46,12 @@ cxx_library( ], xcode_public_headers_symlinks = True, deps = JSC_DEPS + [ - "//native/fb:fb", "//native/third-party/android-ndk:android", "//xplat/folly:molly", "//xplat/fbgloginit:fbgloginit", "//xplat/fbsystrace:fbsystrace", react_native_xplat_target("cxxreact:bridge"), react_native_xplat_target("cxxreact:module"), + FBJNI_TARGET, ], ) diff --git a/ReactCommon/DEFS b/ReactCommon/DEFS index 4ee6051f87..6b3756b7fd 100644 --- a/ReactCommon/DEFS +++ b/ReactCommon/DEFS @@ -7,6 +7,7 @@ def rn_xplat_cxx_library(**kwargs): GLOG_DEP = "//ReactAndroid/build/third-party-ndk/glog:glog" INSPECTOR_FLAGS = [] +STATIC_LIBRARY_IOS_FLAGS = [] JSC_DEPS = [] JSC_INTERNAL_DEPS = []