Merge pull request #789 from asmorkalov:android_na_mk_fix

12 years ago · 71896544ca
parent aef8e6ba59 7bd169caa9
commit 71896544ca
2 changed files with 3 additions and 1 deletions
--- a/samples/android/native-activity/jni/Android.mk
+++ b/samples/android/native-activity/jni/Android.mk
@ -6,7 +6,7 @@ include ../../sdk/native/jni/OpenCV.mk

 LOCAL_MODULE    := native_activity
 LOCAL_SRC_FILES := native.cpp
-LOCAL_LDLIBS    := -lm -llog -landroid
+LOCAL_LDLIBS    += -lm -llog -landroid
 LOCAL_STATIC_LIBRARIES := android_native_app_glue

 include $(BUILD_SHARED_LIBRARY)
--- a/samples/android/native-activity/jni/Application.mk
+++ b/samples/android/native-activity/jni/Application.mk
@ -1,2 +1,4 @@
 APP_ABI := armeabi-v7a
+APP_STL := gnustl_static
+APP_CPPFLAGS := -frtti -fexceptions
 APP_PLATFORM := android-9