From c619c0be5ad08f2fbab90f5417bc2992b8122a95 Mon Sep 17 00:00:00 2001 From: Dustin Shahidehpour Date: Fri, 14 Oct 2016 17:38:27 -0700 Subject: [PATCH] Proper fix for broken android builds. Summary: using `IS_THIS_FBOBJC` will break the tests in the open-source repo. This fixes Facebook builds and open source builds. Reviewed By: WaseemTheDream, mzlee Differential Revision: D4025580 fbshipit-source-id: 8280520a63134744fd24518aa6f45423aa0ecd03 --- uikit/CSSLayout/BUCK | 59 ++++++++++++++++++++++---------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/uikit/CSSLayout/BUCK b/uikit/CSSLayout/BUCK index 4fc7a235..2c9ec8fd 100644 --- a/uikit/CSSLayout/BUCK +++ b/uikit/CSSLayout/BUCK @@ -9,34 +9,33 @@ include_defs('//CSSLAYOUT_DEFS') UIKIT_CSSLAYOUT_COMPILER_FLAGS = ['-fobjc-arc'] -if THIS_IS_FBOBJC: - apple_library( - name = 'CSSLayout', - compiler_flags = UIKIT_CSSLAYOUT_COMPILER_FLAGS, - tests = [':CSSLayoutTests'], - srcs = glob(['*.m']), - exported_headers = glob(['*.h']), - frameworks = [ - '$SDKROOT/System/Library/Frameworks/Foundation.framework', - '$SDKROOT/System/Library/Frameworks/UIKit.framework', - ], - deps = [ - csslayout_dep(':CSSLayout'), - ], - visibility = ['PUBLIC'], - ) +apple_library( + name = 'CSSLayout', + compiler_flags = UIKIT_CSSLAYOUT_COMPILER_FLAGS, + tests = [':CSSLayoutTests'], + srcs = glob(['*.m']), + exported_headers = glob(['*.h']), + frameworks = [ + '$SDKROOT/System/Library/Frameworks/Foundation.framework', + '$SDKROOT/System/Library/Frameworks/UIKit.framework', + ], + deps = [ + csslayout_dep(':CSSLayout'), + ], + visibility = ['PUBLIC'], +) - apple_test( - name = 'CSSLayoutTests', - compiler_flags = UIKIT_CSSLAYOUT_COMPILER_FLAGS, - info_plist = 'Tests/Info.plist', - srcs = glob(['Tests/**/*.m']), - frameworks = [ - '$SDKROOT/System/Library/Frameworks/CoreGraphics.framework', - '$PLATFORM_DIR/Developer/Library/Frameworks/XCTest.framework', - ], - deps = [ - ':CSSLayout', - ], - visibility = ['PUBLIC'], - ) +apple_test( + name = 'CSSLayoutTests', + compiler_flags = UIKIT_CSSLAYOUT_COMPILER_FLAGS, + info_plist = 'Tests/Info.plist', + srcs = glob(['Tests/**/*.m']), + frameworks = [ + '$SDKROOT/System/Library/Frameworks/CoreGraphics.framework', + '$PLATFORM_DIR/Developer/Library/Frameworks/XCTest.framework', + ], + deps = [ + ':CSSLayout', + ], + visibility = ['PUBLIC'], +)