Browse Source

SDL submodule: android

LouYihua 7 years ago
parent
commit
5761efeb8e
4 changed files with 3 additions and 8 deletions
  1. 0 5
      .travis.yml
  2. 1 1
      3rd/SDL
  3. 1 1
      android/jni/src/Android.mk
  4. 1 1
      android/src/org/libsdl/app/SDLActivity.java

+ 0 - 5
.travis.yml

@@ -63,11 +63,6 @@ matrix:
           - unzip android-ndk-$NDK_VERSION-linux-x86_64.zip > /dev/null
           - export ANDROID_NDK_HOME=`pwd`/android-ndk-$NDK_VERSION
           - export PATH=${PATH}:${ANDROID_NDK_HOME}
-          - cd SDL2
-          - wget https://www.libsdl.org/release/SDL2-2.0.5.zip
-          - unzip SDL2-2.0.5.zip
-          - mv SDL2-2.0.5/* .
-          - cd ..
         script:
           - cd android
           - ./gradlew assembleDebug

+ 1 - 1
3rd/SDL

@@ -1 +1 @@
-Subproject commit c851801275125e35a66214cad12a0665131585bd
+Subproject commit cd16afd1e72935aae0fe95ba513d9d63598b3c63

+ 1 - 1
android/jni/src/Android.mk

@@ -1,5 +1,5 @@
 SDLPAL_LOCAL_PATH := $(call my-dir)
-SDL_PATH := $(SDLPAL_LOCAL_PATH)/../../../SDL2
+SDL_PATH := $(SDLPAL_LOCAL_PATH)/../../../3rd/SDL
 
 include $(SDL_PATH)/Android.mk
 

+ 1 - 1
android/src/org/libsdl/app/SDLActivity.java

@@ -1 +1 @@
-../../../../../SDL2/android-project/src/org/libsdl/app/SDLActivity.java
+../../../../../3rd/SDL/android-project/src/org/libsdl/app/SDLActivity.java