From 4fbe0495b474da44d9eca7d33a36ad516863af03 Mon Sep 17 00:00:00 2001
From: Emil Sjolander <emilsj@fb.com>
Date: Wed, 30 Nov 2016 08:16:42 -0800
Subject: [PATCH] Remove force_static

Summary: static linking is dangerous here as more than one library could be including the same symbols. The used to only be used by the jni target previously but that is no longer true

Reviewed By: gkassabli

Differential Revision: D4248487

fbshipit-source-id: e5127a02561b145745cf5393a0188661469ec79b
---
 BUCK      | 5 +++--
 YOGA_DEFS | 3 +++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/BUCK b/BUCK
index d6a6b246..e74a0a6e 100644
--- a/BUCK
+++ b/BUCK
@@ -29,9 +29,10 @@ cxx_library(
   tests=[':tests'],
   exported_headers = subdir_glob([('', 'CSSLayout/*.h')]),
   header_namespace = '',
-  force_static = True,
   compiler_flags = COMPILER_FLAGS,
-  deps = [],
+  deps = [] if THIS_IS_FBOBJC else [
+    csslayout_dep('lib/fb:ndklog'),
+  ],
   visibility = ['PUBLIC'],
 )
 
diff --git a/YOGA_DEFS b/YOGA_DEFS
index 91d372ab..2b4a62c5 100644
--- a/YOGA_DEFS
+++ b/YOGA_DEFS
@@ -9,7 +9,10 @@ GTEST_TARGET = '//lib/gtest:gtest'
 JNI_TARGET = '//lib/jni:jni'
 FBJNI_TARGET = '//lib/fb:fbjni'
 
+THIS_IS_FBOBJC = False
+
 CXX_LIBRARY_WHITELIST = [
+  '//:CSSLayout',
   '//lib/fb:fbjni',
   '//java:jni',
 ]