From 79500f81a9156bd9e3a795f1647dec4d81a60e76 Mon Sep 17 00:00:00 2001 From: Pieter De Baets Date: Fri, 2 Jun 2017 08:55:32 -0700 Subject: [PATCH] Fix Travis CI runs Summary: Closes https://github.com/facebook/react-native/pull/14286 Differential Revision: D5164925 Pulled By: javache fbshipit-source-id: 0ebe028ab58f37a9afc8b615fe346d7af9180040 --- .travis.yml | 2 +- .../Image/RCTImage.xcodeproj/project.pbxproj | 4 ++ RNTester/RNTester/Base.lproj/LaunchScreen.xib | 15 ++--- .../src/main/jni/packagerconnection/BUCK | 61 +++++++++---------- ReactAndroid/src/main/jni/react/jni/BUCK | 16 ++--- ReactCommon/DEFS | 13 +++- 6 files changed, 62 insertions(+), 49 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0cbf424aa..15488c38e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: objective-c -osx_image: xcode8.2 +osx_image: xcode8.3 install: - mkdir -p /Users/travis/build/facebook/.nvm diff --git a/Libraries/Image/RCTImage.xcodeproj/project.pbxproj b/Libraries/Image/RCTImage.xcodeproj/project.pbxproj index cdc99eeac..55815954d 100644 --- a/Libraries/Image/RCTImage.xcodeproj/project.pbxproj +++ b/Libraries/Image/RCTImage.xcodeproj/project.pbxproj @@ -29,6 +29,8 @@ 354631681B69857700AA0B86 /* RCTImageEditingManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 354631671B69857700AA0B86 /* RCTImageEditingManager.m */; }; 3D302E181DF8228100D6DDAE /* RCTImageUtils.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 134B00A01B54232B00EC8DFB /* RCTImageUtils.h */; }; 3D302F211DF8269200D6DDAE /* RCTImageUtils.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 134B00A01B54232B00EC8DFB /* RCTImageUtils.h */; }; + 3DA05A5A1EE0312600805843 /* RCTImageShadowView.h in Headers */ = {isa = PBXBuildFile; fileRef = 59AB09281EDE5DD1009F97B5 /* RCTImageShadowView.h */; }; + 3DA05A5B1EE0312900805843 /* RCTImageShadowView.m in Sources */ = {isa = PBXBuildFile; fileRef = 59AB09291EDE5DD1009F97B5 /* RCTImageShadowView.m */; }; 3DED3A8A1DE6F79800336DD7 /* RCTGIFImageDecoder.h in Headers */ = {isa = PBXBuildFile; fileRef = 1304D5B01AA8C50D0002E2BE /* RCTGIFImageDecoder.h */; }; 3DED3A8B1DE6F79800336DD7 /* RCTImageBlurUtils.h in Headers */ = {isa = PBXBuildFile; fileRef = EEF314701C9B0DD30049118E /* RCTImageBlurUtils.h */; }; 3DED3A8C1DE6F79800336DD7 /* RCTImageCache.h in Headers */ = {isa = PBXBuildFile; fileRef = CCD34C251D4B8FE900268922 /* RCTImageCache.h */; }; @@ -197,6 +199,7 @@ 3DED3A9A1DE6F7A400336DD7 /* RCTImageLoader.h in Headers */, 3DED3A9B1DE6F7A400336DD7 /* RCTImageStoreManager.h in Headers */, 3DED3A9C1DE6F7A400336DD7 /* RCTImageUtils.h in Headers */, + 3DA05A5A1EE0312600805843 /* RCTImageShadowView.h in Headers */, 3DED3A9D1DE6F7A400336DD7 /* RCTImageView.h in Headers */, 3DED3A9E1DE6F7A400336DD7 /* RCTImageViewManager.h in Headers */, 3DED3A9F1DE6F7A400336DD7 /* RCTLocalAssetImageLoader.h in Headers */, @@ -290,6 +293,7 @@ 2D3B5F1C1D9B0D1300451313 /* RCTResizeMode.m in Sources */, 2D3B5F221D9B0D1300451313 /* RCTImageViewManager.m in Sources */, 2D3B5F211D9B0D1300451313 /* RCTImageView.m in Sources */, + 3DA05A5B1EE0312900805843 /* RCTImageShadowView.m in Sources */, 2D3B5F201D9B0D1300451313 /* RCTImageLoader.m in Sources */, 2D3B5F1B1D9B0D0700451313 /* RCTImageBlurUtils.m in Sources */, 2D3B5F241D9B0D1300451313 /* RCTImageUtils.m in Sources */, diff --git a/RNTester/RNTester/Base.lproj/LaunchScreen.xib b/RNTester/RNTester/Base.lproj/LaunchScreen.xib index d8d6ba0a6..9a4c50e15 100644 --- a/RNTester/RNTester/Base.lproj/LaunchScreen.xib +++ b/RNTester/RNTester/Base.lproj/LaunchScreen.xib @@ -1,9 +1,13 @@ - - + + + + + - + + @@ -14,21 +18,18 @@ - - + diff --git a/ReactAndroid/src/main/jni/packagerconnection/BUCK b/ReactAndroid/src/main/jni/packagerconnection/BUCK index b229550b9..1b15a05d6 100644 --- a/ReactAndroid/src/main/jni/packagerconnection/BUCK +++ b/ReactAndroid/src/main/jni/packagerconnection/BUCK @@ -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 [], +) diff --git a/ReactAndroid/src/main/jni/react/jni/BUCK b/ReactAndroid/src/main/jni/react/jni/BUCK index 8d408f8c1..42a1283b6 100644 --- a/ReactAndroid/src/main/jni/react/jni/BUCK +++ b/ReactAndroid/src/main/jni/react/jni/BUCK @@ -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 [], ) diff --git a/ReactCommon/DEFS b/ReactCommon/DEFS index 6b3756b7f..7c3b5ac27 100644 --- a/ReactCommon/DEFS +++ b/ReactCommon/DEFS @@ -1,12 +1,21 @@ # Set up common deps # Building is not supported in OSS right now -def rn_xplat_cxx_library(**kwargs): - pass +def rn_xplat_cxx_library(name, **kwargs): + cxx_library(name = name) + +# Helper for referring to an Android RN target +def react_native_target(path): + return '//ReactAndroid/src/main/' + path + +# Helper for referring to an xplat RN target +def react_native_xplat_target(path): + return '//ReactCommon/' + path GLOG_DEP = "//ReactAndroid/build/third-party-ndk/glog:glog" INSPECTOR_FLAGS = [] +DEBUG_PREPROCESSOR_FLAGS = [] STATIC_LIBRARY_IOS_FLAGS = [] JSC_DEPS = []