From 8fcd544c8158d860d963a08476b425f5cafef069 Mon Sep 17 00:00:00 2001
From: Joel Marcey <joelm@fb.com>
Date: Sat, 10 Dec 2016 17:31:11 -0800
Subject: [PATCH 1/2] A bit more syncing after the name change

---
 .travis.yml  | 2 +-
 BUCK         | 4 ++--
 YogaKit/BUCK | 1 -
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 618dbb0a..608e2bab 100644
--- a/.travis.yml
+++ b/.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^
diff --git a/BUCK b/BUCK
index 09e39b43..b9d6c907 100644
--- a/BUCK
+++ b/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,
diff --git a/YogaKit/BUCK b/YogaKit/BUCK
index 4a781038..900ededb 100644
--- a/YogaKit/BUCK
+++ b/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 = [

From f36f545d75b338d24416f1584690e61d1ccd4cc7 Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Fri, 9 Dec 2016 10:10:39 -0800
Subject: [PATCH 2/2] Add an anchor to the android platform regex

Summary: This prevents android from matching in the middle of a platform.

Reviewed By: gkassabli

Differential Revision: D4306164

fbshipit-source-id: 7f62a6a017724f8f6741d3e53b5fbe0650c8c88e
---
 lib/fb/BUCK | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/fb/BUCK b/lib/fb/BUCK
index da59ceaa..7300608d 100644
--- a/lib/fb/BUCK
+++ b/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],
 )