Moving exception flag to LOCAL_CFLAGS to reduce the diff (#24)

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

@@ -29,8 +29,8 @@ LOCAL_SRC_FILES:= \
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/include
 
-LOCAL_CFLAGS := -DLOG_TAG=\"libfb\" -DDISABLE_CPUCAP -DDISABLE_XPLAT
-LOCAL_CXXFLAGS += -frtti -fexceptions 
+LOCAL_CFLAGS := -DLOG_TAG=\"libfb\" -DDISABLE_CPUCAP -DDISABLE_XPLAT -fexceptions -frtti
+
 # include/utils/threads.h has unused parameters
 LOCAL_CFLAGS += -Wno-unused-parameter
 ifeq ($(TOOLCHAIN_PERMISSIVE),true)

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

@@ -12,8 +12,7 @@ LOCAL_SRC_FILES:= \
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)
 
-LOCAL_CFLAGS := -fno-omit-frame-pointer
-LOCAL_CXXFLAGS := -fexceptions 
+LOCAL_CFLAGS := -fexceptions -fno-omit-frame-pointer
 
 LOCAL_LDLIBS := -llog
 

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

@@ -14,8 +14,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/jni
 
-LOCAL_CFLAGS += -fvisibility=hidden -O3
-LOCAL_CXXFLAGS += -frtti -fexceptions
+LOCAL_CFLAGS += -fvisibility=hidden -frtti -fexceptions -O3
 
 LOCAL_LDLIBS += -landroid -llog
 LOCAL_STATIC_LIBRARIES := libyogacore

ReactAndroid/src/main/jni/react/jni/Android.mk

@@ -10,6 +10,10 @@ include $(CLEAR_VARS)
 # Flag to enable V8 in react-native code
 V8_ENABLED := 1
 
+# Name of this module.
+#
+# Other modules can depend on this one by adding libreactnativejni to their
+# LOCAL_SHARED_LIBRARIES variable.
 LOCAL_MODULE := reactnativejni
 
 LOCAL_SRC_FILES := \
@@ -35,6 +39,7 @@ LOCAL_SRC_FILES := \
   WritableNativeArray.cpp \
   WritableNativeMap.cpp \
 
+# Include . in the header search path for all source files in this module.
 LOCAL_C_INCLUDES := $(LOCAL_PATH)
 
 # Include ./../../ in the header search path for modules that depend on
@@ -44,8 +49,7 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH)
 #   ./../ == react
 LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../..
 
-LOCAL_CFLAGS += -fvisibility=hidden
-LOCAL_CFLAGS += -fexceptions -frtti
+LOCAL_CFLAGS += -fvisibility=hidden -fexceptions -frtti
 
 LOCAL_LDLIBS += -landroid
 
@@ -68,7 +72,6 @@ else
   LOCAL_SHARED_LIBRARIES += libjsc
 endif
 
-
 # The static libraries (.a files) that this module depends on.
 LOCAL_STATIC_LIBRARIES := libreactnative
 

ReactCommon/cxxreact/Android.mk

@@ -34,9 +34,10 @@ LOCAL_EXPORT_C_INCLUDES := $(LOCAL_C_INCLUDES)
 LOCAL_CFLAGS := \
   -DLOG_TAG=\"ReactNative\"
 
+LOCAL_CFLAGS += -fexceptions -frtti
+
 LOCAL_STATIC_LIBRARIES := boost
 LOCAL_SHARED_LIBRARIES := libfb libfolly_json libglog 
-LOCAL_CXXFLAGS += -fexceptions -frtti
 
 LOCAL_V8_FILES := \
     File.cpp \