diff options
| author | arne <arne@gaia.fritz.box> | 2012-12-25 23:22:13 +0100 |
|---|---|---|
| committer | arne <arne@gaia.fritz.box> | 2012-12-25 23:22:13 +0100 |
| commit | c9dc454f4ec38f075f951fbf32935054023eed94 (patch) | |
| tree | 33d36c8bfb68db406e3ae90237b145077efecda5 /jni | |
| parent | e57c7dd4a792d02897140d0c5e2d014bcd1147c0 (diff) | |
| parent | b2b8b3da3f501543338fc5065519ab778379c274 (diff) | |
Merge local changes with repository
Diffstat (limited to 'jni')
| -rw-r--r-- | jni/Android.mk | 4 | ||||
| -rw-r--r-- | jni/Application.mk | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/jni/Android.mk b/jni/Android.mk index 3514b920..283be302 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -5,6 +5,10 @@ include lzo/Android.mk include openssl/Android.mk +ifneq ($(TARGET_ARCH),mips) +include google-breakpad/android/google_breakpad/Android.mk +endif + include openvpn/Android.mk diff --git a/jni/Application.mk b/jni/Application.mk index 38ce95f3..5670b6e3 100644 --- a/jni/Application.mk +++ b/jni/Application.mk @@ -1,6 +1,7 @@ APP_ABI := all NDK_TOOLCHAIN_VERSION=4.4.3 #APP_PLATFORM := android-14 +APP_STL:=stlport_static #APP_OPTIM := release |