Skip to content

Moving exception flag to LOCAL_CFLAGS to reduce the diff #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
2 commits merged into from
Apr 2, 2019
Merged

Moving exception flag to LOCAL_CFLAGS to reduce the diff #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2406f1d
Moving exception flag to LOCAL_CFLAGS to reduce the diff
rohitjainMS Mar 27, 2019
0b42645
Merge branch 'master' into cxceptionflags
rohitjain85 Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ReactAndroid/src/main/jni/first-party/fb/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 1 addition & 2 deletions ReactAndroid/src/main/jni/first-party/fbgloginit/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions ReactAndroid/src/main/jni/first-party/yogajni/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 6 additions & 3 deletions ReactAndroid/src/main/jni/react/jni/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 := \
Expand All @@ -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
Expand All @@ -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

Expand All @@ -68,7 +72,6 @@ else
LOCAL_SHARED_LIBRARIES += libjsc
endif


# The static libraries (.a files) that this module depends on.
LOCAL_STATIC_LIBRARIES := libreactnative

Expand Down
3 changes: 2 additions & 1 deletion ReactCommon/cxxreact/Android.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down