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',
 ]