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
This commit is contained in:
committed by
Facebook Github Bot
parent
63d3e8f3f3
commit
c619c0be5a
@@ -9,34 +9,33 @@ include_defs('//CSSLAYOUT_DEFS')
|
|||||||
|
|
||||||
UIKIT_CSSLAYOUT_COMPILER_FLAGS = ['-fobjc-arc']
|
UIKIT_CSSLAYOUT_COMPILER_FLAGS = ['-fobjc-arc']
|
||||||
|
|
||||||
if THIS_IS_FBOBJC:
|
apple_library(
|
||||||
apple_library(
|
name = 'CSSLayout',
|
||||||
name = 'CSSLayout',
|
compiler_flags = UIKIT_CSSLAYOUT_COMPILER_FLAGS,
|
||||||
compiler_flags = UIKIT_CSSLAYOUT_COMPILER_FLAGS,
|
tests = [':CSSLayoutTests'],
|
||||||
tests = [':CSSLayoutTests'],
|
srcs = glob(['*.m']),
|
||||||
srcs = glob(['*.m']),
|
exported_headers = glob(['*.h']),
|
||||||
exported_headers = glob(['*.h']),
|
frameworks = [
|
||||||
frameworks = [
|
'$SDKROOT/System/Library/Frameworks/Foundation.framework',
|
||||||
'$SDKROOT/System/Library/Frameworks/Foundation.framework',
|
'$SDKROOT/System/Library/Frameworks/UIKit.framework',
|
||||||
'$SDKROOT/System/Library/Frameworks/UIKit.framework',
|
],
|
||||||
],
|
deps = [
|
||||||
deps = [
|
csslayout_dep(':CSSLayout'),
|
||||||
csslayout_dep(':CSSLayout'),
|
],
|
||||||
],
|
visibility = ['PUBLIC'],
|
||||||
visibility = ['PUBLIC'],
|
)
|
||||||
)
|
|
||||||
|
|
||||||
apple_test(
|
apple_test(
|
||||||
name = 'CSSLayoutTests',
|
name = 'CSSLayoutTests',
|
||||||
compiler_flags = UIKIT_CSSLAYOUT_COMPILER_FLAGS,
|
compiler_flags = UIKIT_CSSLAYOUT_COMPILER_FLAGS,
|
||||||
info_plist = 'Tests/Info.plist',
|
info_plist = 'Tests/Info.plist',
|
||||||
srcs = glob(['Tests/**/*.m']),
|
srcs = glob(['Tests/**/*.m']),
|
||||||
frameworks = [
|
frameworks = [
|
||||||
'$SDKROOT/System/Library/Frameworks/CoreGraphics.framework',
|
'$SDKROOT/System/Library/Frameworks/CoreGraphics.framework',
|
||||||
'$PLATFORM_DIR/Developer/Library/Frameworks/XCTest.framework',
|
'$PLATFORM_DIR/Developer/Library/Frameworks/XCTest.framework',
|
||||||
],
|
],
|
||||||
deps = [
|
deps = [
|
||||||
':CSSLayout',
|
':CSSLayout',
|
||||||
],
|
],
|
||||||
visibility = ['PUBLIC'],
|
visibility = ['PUBLIC'],
|
||||||
)
|
)
|
||||||
|
Reference in New Issue
Block a user