From c8e98bbaf58b7a7f866e831982355b78dfa43b9d Mon Sep 17 00:00:00 2001
From: Sergei Dryganets <sergeyd@microsoft.com>
Date: Fri, 12 Jan 2018 07:49:15 -0800
Subject: [PATCH] CI for Android fixed

Summary:
Fix for android github CI.

Github CI doesn't work without this change.

CI passes.

[INTERNAL] Android CI fix.
Closes https://github.com/facebook/react-native/pull/17551

Differential Revision: D6707477

Pulled By: hramos

fbshipit-source-id: f98515234da3b90ee3233523bcd7cc67ed82c1b4
---
 .../main/third-party/java/robolectric3/robolectric/BUCK   | 8 ++++----
 ReactCommon/DEFS                                          | 3 +--
 ReactCommon/yoga/BUCK                                     | 4 +++-
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK
index f69026998..d285355ca 100644
--- a/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK
+++ b/ReactAndroid/src/main/third-party/java/robolectric3/robolectric/BUCK
@@ -115,7 +115,7 @@ prebuilt_jar(
 export_file(
     name = "robolectric-android-all-binary-jar",
     src = ":robolectric-android-all-binary-remote-jar",
-    out = "android-all-4.1.2_r1-robolectric-0.jar",  # name defines filename used by robolectric in runtime
+    out = "../android-all-4.1.2_r1-robolectric-0.jar",  # name defines filename used by robolectric in runtime
 )
 
 remote_file(
@@ -133,7 +133,7 @@ prebuilt_jar(
 export_file(
     name = "json-jar",
     src = ":json-remote-jar",
-    out = "json-20080701.jar",  # name defines filename used by robolectric in runtime
+    out = "../json-20080701.jar",  # name defines filename used by robolectric in runtime
 )
 
 remote_file(
@@ -151,7 +151,7 @@ prebuilt_jar(
 export_file(
     name = "tagsoup-jar",
     src = ":tagsoup-remote-jar",
-    out = "tagsoup-1.2.jar",  # name defines filename used by robolectric in runtime
+    out = "../tagsoup-1.2.jar",  # name defines filename used by robolectric in runtime
 )
 
 remote_file(
@@ -169,7 +169,7 @@ prebuilt_jar(
 export_file(
     name = "robolectric-shadows-binary-jar",
     src = ":robolectric-shadows-binary-remote-jar",
-    out = "shadows-core-3.0-16.jar",  # name defines filename used by robolectric in runtime
+    out = "../shadows-core-3.0-16.jar",  # name defines filename used by robolectric in runtime
 )
 
 remote_file(
diff --git a/ReactCommon/DEFS b/ReactCommon/DEFS
index 7c3b5ac27..140e9b2ff 100644
--- a/ReactCommon/DEFS
+++ b/ReactCommon/DEFS
@@ -2,8 +2,7 @@
 
 # Building is not supported in OSS right now
 def rn_xplat_cxx_library(name, **kwargs):
-  cxx_library(name = name)
-
+  cxx_library(name, **kwargs)
 # Helper for referring to an Android RN target
 def react_native_target(path):
   return '//ReactAndroid/src/main/' + path
diff --git a/ReactCommon/yoga/BUCK b/ReactCommon/yoga/BUCK
index 65bfdf418..3fb56b336 100644
--- a/ReactCommon/yoga/BUCK
+++ b/ReactCommon/yoga/BUCK
@@ -1,4 +1,6 @@
-fb_xplat_cxx_library(
+include_defs("//ReactCommon/DEFS")
+
+rn_xplat_cxx_library(
     name = "yoga",
     srcs = glob(["yoga/*.cpp"]),
     header_namespace = "",