Move ReactCommon/CSSLayout to ReactCommon/CSSLayout/CSSLayout

Reviewed By: emilsjolander

Differential Revision: D4182345

fbshipit-source-id: 05cb4f0b0e7971d4f66e656ea89d876264a61bd4

React/CSSLayout/Android.mk

@@ -1,16 +0,0 @@
-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)

ReactAndroid/src/main/jni/first-party/csslayoutjni/Android.mk

@@ -8,7 +8,6 @@ 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

ReactCommon/CSSLayout/Android.mk

@@ -5,8 +5,8 @@ include $(CLEAR_VARS)
 LOCAL_MODULE := csslayoutcore
 
 LOCAL_SRC_FILES := \
-  CSSLayout.c \
-  CSSNodeList.c
+  CSSLayout/CSSLayout.c \
+  CSSLayout/CSSNodeList.c
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)