diff options
| author | Anton Vaytulevich <anton.vaytulevich@rubius.com> | 2017-06-29 18:18:29 +0700 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2017-06-29 14:15:10 +0200 |
| commit | 39d936d4d6f341f65c7888ef26550d03768d82cc (patch) | |
| tree | c7e638e23a98a3d5d550e871782029d9f04d3623 /main | |
| parent | 3967b8a53ddce341f92c16d545f524d91a7127ef (diff) | |
Add short command path when building on Windows
Diffstat (limited to 'main')
| -rw-r--r-- | main/jni/Android.mk | 1 | ||||
| -rw-r--r-- | main/jni/Application.mk | 4 | ||||
| -rw-r--r-- | main/misc/build-native.bat | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/main/jni/Android.mk b/main/jni/Android.mk index ec88cb8e..828bb8da 100644 --- a/main/jni/Android.mk +++ b/main/jni/Android.mk @@ -7,7 +7,6 @@ JNI_DIR := $(call my-dir) # Build openvpn with mbedTLS (OpenVPN3 core is always build with mbedTLS) #USE_BREAKPAD=0 - include lzo/Android.mk include openssl/Android.mk diff --git a/main/jni/Application.mk b/main/jni/Application.mk index c38403a4..838c2eba 100644 --- a/main/jni/Application.mk +++ b/main/jni/Application.mk @@ -1,3 +1,7 @@ +ifeq ($(USE_SHORT_COMMANDS),1) + APP_SHORT_COMMANDS := true +endif + APP_ABI := arm64-v8a armeabi armeabi-v7a x86 x86_64 APP_PLATFORM := android-14 diff --git a/main/misc/build-native.bat b/main/misc/build-native.bat index 636e6f7d..1214464b 100644 --- a/main/misc/build-native.bat +++ b/main/misc/build-native.bat @@ -41,9 +41,9 @@ if not exist openvpn\.git ( ) if [%1] == [] ( - ndk-build -j 8 USE_BREAKPAD=0 + ndk-build USE_SHORT_COMMANDS=1 -j 8 USE_BREAKPAD=0 ) else ( - ndk-build %* + ndk-build USE_SHORT_COMMANDS=1 %* ) if not errorlevel 0 goto error |