From 07ef5a8fe9457852a44b801fa1a0503a1a28f1b1 Mon Sep 17 00:00:00 2001
From: Andy Street <andrews@fb.com>
Date: Mon, 14 Nov 2016 06:08:16 -0800
Subject: [PATCH] Build C-version of CSSLayout in open source

Summary: Builds and ships libcsslayout.so with Android builds. This is not used yet, but a follow up diff will shortly move us from CSSNodeDEPRECATED to CSSNode (which uses libcsslayout)

Reviewed By: emilsjolander

Differential Revision: D4168140

fbshipit-source-id: d72bded88df81e4d54df31a08e4b101834770a73
---
 React/CSSLayout/Android.mk                    | 16 ++++++++++++
 .../jni/first-party/csslayoutjni/Android.mk   | 25 +++++++++++++++++++
 .../src/main/jni/xreact/jni/Android.mk        |  3 ++-
 ReactCommon/CSSLayout/Android.mk              | 16 ++++++++++++
 4 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 React/CSSLayout/Android.mk
 create mode 100644 ReactAndroid/src/main/jni/first-party/csslayoutjni/Android.mk
 create mode 100644 ReactCommon/CSSLayout/Android.mk

diff --git a/React/CSSLayout/Android.mk b/React/CSSLayout/Android.mk
new file mode 100644
index 000000000..c2fc293dc
--- /dev/null
+++ b/React/CSSLayout/Android.mk
@@ -0,0 +1,16 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := csslayoutcore
+
+LOCAL_SRC_FILES := \
+  CSSLayout.c \
+  CSSNodeList.c
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
+
+LOCAL_CFLAGS := -Wall -Werror -fexceptions -frtti -std=c99
+
+include $(BUILD_STATIC_LIBRARY)
diff --git a/ReactAndroid/src/main/jni/first-party/csslayoutjni/Android.mk b/ReactAndroid/src/main/jni/first-party/csslayoutjni/Android.mk
new file mode 100644
index 000000000..5ea162f26
--- /dev/null
+++ b/ReactAndroid/src/main/jni/first-party/csslayoutjni/Android.mk
@@ -0,0 +1,25 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := csslayout
+
+LOCAL_SRC_FILES := \
+  jni/CSSJNI.cpp
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/jni
+LOCAL_C_INCLUDES += $(REACT_COMMON_DIR)
+
+LOCAL_CFLAGS += -Wall -Werror -fvisibility=hidden -fexceptions -frtti
+CXX11_FLAGS := -std=c++11
+LOCAL_CFLAGS += $(CXX11_FLAGS)
+LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
+
+LOCAL_LDLIBS += -landroid -llog
+LOCAL_STATIC_LIBRARIES := libcsslayoutcore
+LOCAL_SHARED_LIBRARIES := libfb
+
+include $(BUILD_SHARED_LIBRARY)
+
+$(call import-module,CSSLayout)
+$(call import-module,fb)
diff --git a/ReactAndroid/src/main/jni/xreact/jni/Android.mk b/ReactAndroid/src/main/jni/xreact/jni/Android.mk
index 4eb04b448..29ee75263 100644
--- a/ReactAndroid/src/main/jni/xreact/jni/Android.mk
+++ b/ReactAndroid/src/main/jni/xreact/jni/Android.mk
@@ -34,7 +34,7 @@ LOCAL_CFLAGS += $(CXX11_FLAGS)
 LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
 
 LOCAL_LDLIBS += -landroid
-LOCAL_SHARED_LIBRARIES := libfolly_json libfbjni libjsc libglog_init
+LOCAL_SHARED_LIBRARIES := libfolly_json libfbjni libjsc libglog_init libcsslayout
 LOCAL_STATIC_LIBRARIES := libreactnativefb
 
 include $(BUILD_SHARED_LIBRARY)
@@ -44,3 +44,4 @@ $(call import-module,jsc)
 $(call import-module,folly)
 $(call import-module,fbgloginit)
 $(call import-module,jsc)
+$(call import-module,csslayoutjni)
diff --git a/ReactCommon/CSSLayout/Android.mk b/ReactCommon/CSSLayout/Android.mk
new file mode 100644
index 000000000..c2fc293dc
--- /dev/null
+++ b/ReactCommon/CSSLayout/Android.mk
@@ -0,0 +1,16 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := csslayoutcore
+
+LOCAL_SRC_FILES := \
+  CSSLayout.c \
+  CSSNodeList.c
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)
+LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
+
+LOCAL_CFLAGS := -Wall -Werror -fexceptions -frtti -std=c99
+
+include $(BUILD_STATIC_LIBRARY)