diff options
author | arne@gaia.fritz.box <arne@gaia.fritz.box> | 2012-12-25 23:22:13 +0100 |
---|---|---|
committer | arne@gaia.fritz.box <arne@gaia.fritz.box> | 2012-12-25 23:22:13 +0100 |
commit | 3018f292ff635d7ec61b3cd02a1e13659819683f (patch) | |
tree | 32de630e310e6055124ee92a0d5788a76f6cd94d /jni/Android.mk | |
parent | 83dfeaa842bd42840698bdce9a91207a75395b3e (diff) | |
parent | 80d073d5fd79e0c57e33e708e6917e9f36c9bebc (diff) |
Merge local changes with repository
Diffstat (limited to 'jni/Android.mk')
-rw-r--r-- | jni/Android.mk | 4 |
1 files changed, 4 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 |