Browse Source

Updated .gitignore and fixed an Android version problem

tags/2021-05-28
jules 10 years ago
parent
commit
1107638f1e
4 changed files with 5 additions and 4 deletions
  1. +1
    -0
      .gitignore
  2. +1
    -1
      examples/Demo/Builds/Android/build.xml
  3. +2
    -2
      examples/Demo/Builds/Android/jni/Application.mk
  4. +1
    -1
      examples/MidiTest/Builds/Android/src/com/yourcompany/miditest/MidiTest.java

+ 1
- 0
.gitignore View File

@@ -47,4 +47,5 @@ profile
**/CodeBlocks/obj
**/CodeBlocks/*.depend
**/CodeBlocks/*.layout
**/Builds/AndroidStudio
doxygen/doc

+ 1
- 1
examples/Demo/Builds/Android/build.xml View File

@@ -17,7 +17,7 @@
<condition property="ndkDebugValue" value="NDK_DEBUG=1" else="NDK_DEBUG=0">
<equals arg1="${ant.project.invoked-targets}" arg2="debug"/>
</condition>
<condition property="app_abis" value="armeabi armeabi-v7a" else="armeabi armeabi-v7a">
<condition property="app_abis" value="armeabi x86" else="armeabi armeabi-v7a x86">
<equals arg1="${ant.project.invoked-targets}" arg2="debug"/>
</condition>
<exec executable="${ndk.dir}/ndk-build" dir="${basedir}" failonerror="true">


+ 2
- 2
examples/Demo/Builds/Android/jni/Application.mk View File

@@ -7,7 +7,7 @@ APP_PLATFORM := android-10
NDK_TOOLCHAIN_VERSION := 4.8
ifeq ($(NDK_DEBUG),1)
APP_ABI := armeabi armeabi-v7a
APP_ABI := armeabi x86
else
APP_ABI := armeabi armeabi-v7a
APP_ABI := armeabi armeabi-v7a x86
endif

+ 1
- 1
examples/MidiTest/Builds/Android/src/com/yourcompany/miditest/MidiTest.java View File

@@ -1134,7 +1134,7 @@ public class MidiTest extends Activity
try
{
instrumentation.sendKeyDownUpSync (KeyEvent.KEYCODE_BREAK);
instrumentation.sendKeyDownUpSync (KeyEvent.KEYCODE_UNKNOWN);
}
catch (Exception e)
{


Loading…
Cancel
Save