diff options
| author | Wohlstand <admin@wohlnet.ru> | 2017-11-26 03:08:47 +0300 |
|---|---|---|
| committer | Wohlstand <admin@wohlnet.ru> | 2017-11-26 03:08:47 +0300 |
| commit | b92cc8e942b91268b096757fe22aca8368ea3de6 (patch) | |
| tree | 086ee97fed7ed2aad2e64e8870021ba032fd9c59 /android | |
| parent | 52bbba002d7f39334e833f3ec9e1de010d161bdf (diff) | |
| parent | 5fa684bd2732f638763cd62bed831ccc6aafc0bf (diff) | |
| download | libADLMIDI-b92cc8e942b91268b096757fe22aca8368ea3de6.tar.gz libADLMIDI-b92cc8e942b91268b096757fe22aca8368ea3de6.tar.bz2 libADLMIDI-b92cc8e942b91268b096757fe22aca8368ea3de6.zip | |
Merge branch 'master' into get-rid-of-backup-buffer
Diffstat (limited to 'android')
| -rw-r--r-- | android/Android.mk | 3 | ||||
| -rw-r--r-- | android/jni/Application.mk | 4 | ||||
| -rw-r--r-- | android/project.properties | 11 |
3 files changed, 4 insertions, 14 deletions
diff --git a/android/Android.mk b/android/Android.mk index 954d4e5..b87ff40 100644 --- a/android/Android.mk +++ b/android/Android.mk @@ -3,7 +3,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE := adlmidi_shared LOCAL_SRC_FILES := libs/$(TARGET_ARCH_ABI)/libADLMIDI.so +LOCAL_CFLAGS := -DENABLE_BEGIN_SILENCE_SKIPPING LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/../src $(LOCAL_PATH)/../include -TARGET_PLATFORM = android-10 +TARGET_PLATFORM = android-14 include $(PREBUILT_SHARED_LIBRARY) diff --git a/android/jni/Application.mk b/android/jni/Application.mk index 40ce33a..a0d5ce7 100644 --- a/android/jni/Application.mk +++ b/android/jni/Application.mk @@ -1,8 +1,8 @@ APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 APP_MODULES := ADLMIDI -APP_PLATFORM := android-10 +APP_PLATFORM := android-14 APP_OPTIM := release APP_CPPFLAGS += -std=c++11 APP_STL := c++_static APP_CFLAGS := -Ofast -NDK_TOOLCHAIN_VERSION := 4.9 +NDK_TOOLCHAIN_VERSION := clang diff --git a/android/project.properties b/android/project.properties deleted file mode 100644 index f049142..0000000 --- a/android/project.properties +++ /dev/null @@ -1,11 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must be checked in Version Control Systems. -# -# To customize properties used by the Ant build system use, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-10 |