Merge pull request #789 from asmorkalov:android_na_mk_fix

71896544 · Andrey Kamaev · OpenCV Buildbot · aef8e6ba · 7bd169ca · 71896544
Commit 71896544 authored Apr 09, 2013 by Andrey Kamaev Committed by OpenCV Buildbot Apr 09, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

Android.mk samples/android/native-activity/jni/Android.mk +1 -1

Application.mk samples/android/native-activity/jni/Application.mk +2 -0

No files found.
--- 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
 APP_ABI := armeabi-v7a
+APP_STL := gnustl_static
+APP_CPPFLAGS := -frtti -fexceptions
 APP_PLATFORM := android-9