status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-01-14 11:34:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix jni build with gradle

Browse Source 
Summary:
fc94f1e6d0ac61e250c13d293ff76c9c5a5dbbf5 and the following commits introduced some changes to the jni build but only changed the BUCK build files and not the gradle ones. This ports the changes to the gradle build files to fix the build.
Closes https://github.com/facebook/react-native/pull/5791

Reviewed By: svcscm

Differential Revision: D2910012

Pulled By: vjeux

fb-gh-sync-id: b6c7edfed6873d501e46e80a0c9f128d9df04ca4
This commit is contained in:
Janic Duplessis 2016-02-06 14:02:54 -08:00 committed by facebook-github-bot-7
parent 8c4f644385
commit 62440b86b0
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ReactAndroid/src/main/jni/react/Android.mk
View File

@ -9,8 +9,8 @@ LOCAL_SRC_FILES := \
JSCExecutor.cpp \
JSCHelpers.cpp \
JSCWebWorker.cpp \
JSModulesUnbundle.cpp \
MethodCall.cpp \
Platform.cpp \
Value.cpp \
LOCAL_C_INCLUDES := $(LOCAL_PATH)/..
@ -24,7 +24,7 @@ CXX11_FLAGS := -std=c++11
LOCAL_CFLAGS += $(CXX11_FLAGS)
LOCAL_EXPORT_CPPFLAGS := $(CXX11_FLAGS)
LOCAL_SHARED_LIBRARIES := libfb libfbjni libfolly_json libjsc
LOCAL_SHARED_LIBRARIES := libfb libfbjni libfolly_json libjsc libglog
include $(BUILD_STATIC_LIBRARY)
@ -32,3 +32,4 @@ $(call import-module,fb)
$(call import-module,jni)
$(call import-module,folly)
$(call import-module,jsc)
$(call import-module,glog)

3
ReactAndroid/src/main/jni/react/jni/Android.mk
View File

@ -6,7 +6,10 @@ LOCAL_MODULE := reactnativejni
LOCAL_SRC_FILES := \
JMessageQueueThread.cpp \
JSCPerfLogging.cpp \
JSLoader.cpp \
JSLogging.cpp \
JniJSModulesUnbundle.cpp \
NativeArray.cpp \
OnLoad.cpp \
ProxyExecutor.cpp \