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 /openvpn/Android.mk | |
| parent | 83dfeaa842bd42840698bdce9a91207a75395b3e (diff) | |
| parent | 80d073d5fd79e0c57e33e708e6917e9f36c9bebc (diff) | |
Merge local changes with repository
Diffstat (limited to 'openvpn/Android.mk')
| -rw-r--r-- | openvpn/Android.mk | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/openvpn/Android.mk b/openvpn/Android.mk index b27ef794..c68bcccf 100644 --- a/openvpn/Android.mk +++ b/openvpn/Android.mk @@ -1,17 +1,21 @@ -# Android openvpn JNI LOCAL_PATH:= $(call my-dir)/ include $(CLEAR_VARS) LOCAL_LDLIBS := -lz -LOCAL_C_INCLUDES := openssl/include lzo/include openssl/crypto openssl openvpn/src/compat openvpn/src/openvpn openvpn/include +LOCAL_C_INCLUDES := openssl/include lzo/include openssl/crypto openssl openvpn/src/compat openvpn/src/openvpn openvpn/include google-breakpad/src google-breakpad/src/common/android/include LOCAL_SHARED_LIBRARIES := libssl libcrypto #LOCAL_STATIC_LIBRARIES := libssl_static libcrypto_static liblzo-static + +LOCAL_CFLAGS= -DHAVE_CONFIG_H -DTARGET_ABI=\"${TARGET_ABI}\" LOCAL_STATIC_LIBRARIES := liblzo-static +ifneq ($(TARGET_ARCH),mips) +LOCAL_STATIC_LIBRARIES += breakpad_client +LOCAL_CFLAGS += -DGOOGLE_BREAKPAD=1 +endif -LOCAL_CFLAGS= -DHAVE_CONFIG_H -DTARGET_ABI=\"${TARGET_ABI}\" LOCAL_MODULE = openvpn LOCAL_SRC_FILES:= \ @@ -85,7 +89,12 @@ LOCAL_SRC_FILES:= \ src/openvpn/ssl_verify_openssl.c \ src/openvpn/ssl_verify_polarssl.c \ src/openvpn/status.c \ - src/openvpn/tun.c + src/openvpn/tun.c +ifneq ($(TARGET_ARCH),mips) +LOCAL_SRC_FILES+=src/openvpn/breakpad.cpp +endif + + include $(BUILD_SHARED_LIBRARY) #include $(BUILD_EXECUTABLE) |