Merge branch 'master' of https://github.com/pre10der89/css-layout into csharp_wrapper

.travis.yml

@@ -23,7 +23,7 @@ before_install:
 script:
   - buck test //:yoga
   - buck test //java:java
-  - buck test //YogaKit:YogaKit --config cxx.default_platform=iphonesimulator-x86_64 --config cxx.cflags=-DTRAVIS_CI
+  - buck test //YogaKit:YogaKitTests --config cxx.default_platform=iphonesimulator-x86_64 --config cxx.cflags=-DTRAVIS_CI
   - sh csharp/tests/Facebook.Yoga/test_macos.sh
   - buck run //benchmark:benchmark
   - git checkout HEAD^

BUCK

@@ -27,7 +27,7 @@ cxx_library(
   name = 'yoga',
   soname = 'libyogacore.$(ext)',
   srcs = glob(['yoga/*.c']),
-  tests=[':tests'],
+  tests=[':YogaTests'],
   exported_headers = subdir_glob([('', 'yoga/*.h')]),
   header_namespace = '',
   compiler_flags = COMPILER_FLAGS,
@@ -38,7 +38,7 @@ cxx_library(
 )
 
 cxx_test(
-  name = 'tests',
+  name = 'YogaTests',
   contacts = ['emilsj@fb.com'],
   srcs = glob(['tests/*.cpp']),
   compiler_flags = TEST_COMPILER_FLAGS,

YogaKit/BUCK

@@ -30,7 +30,6 @@ COMPILER_FLAGS = [
 apple_library(
   name = 'YogaKit',
   compiler_flags = COMPILER_FLAGS,
-  tests = [':YogaKitTests'],
   srcs = glob(['*.m']),
   exported_headers = glob(['*.h']),
   frameworks = [

lib/fb/BUCK

@@ -11,7 +11,7 @@ prebuilt_cxx_library(
   name = 'ndklog',
   header_only = True,
   exported_platform_linker_flags = [
-    ('android.*', ['-llog']),
+    ('^android.*', ['-llog']),
   ],
   visibility = [YOGA_ROOT],
 )