From da66cb55f4fa91137b186e6ad9faaa98beff5f33 Mon Sep 17 00:00:00 2001 From: Siddharth Date: Wed, 2 Oct 2013 11:11:33 +0530 Subject: [PATCH] Revert "changed the gitignore and android/project files" This was to be done on a separate branch. Reverting change. This reverts commit 43a0d5f60f667a08e25355e124536f68ac4205fd. --- .gitignore | 3 --- android/.classpath | 18 +++++++++--------- android/ab.sh | 2 +- android/project.properties | 2 +- 4 files changed, 11 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 0db7a7d37b..f9dc576d5e 100644 --- a/.gitignore +++ b/.gitignore @@ -68,6 +68,3 @@ libat3plusdecoder.dylib libat3plusdecoder.so at3plusdecoder.dll at3plusdecoder64.dll - - -android/lint.xml diff --git a/android/.classpath b/android/.classpath index 51769745b2..26bdfa6eb5 100644 --- a/android/.classpath +++ b/android/.classpath @@ -1,9 +1,9 @@ - - - - - - - - - + + + + + + + + + diff --git a/android/ab.sh b/android/ab.sh index 1443abf761..98dd7a71bf 100755 --- a/android/ab.sh +++ b/android/ab.sh @@ -1,3 +1,3 @@ cp -r ../flash0 assets cp -r ../lang assets -NDK_MODULE_PATH=..:../native/ext ndk-build -j3 TARGET_PLATFORM=android-9 $* +NDK_MODULE_PATH=..:../native/ext $NDK/ndk-build -j3 TARGET_PLATFORM=android-9 $* diff --git a/android/project.properties b/android/project.properties index 84b11fd245..babca9a8c9 100644 --- a/android/project.properties +++ b/android/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-18 +target=android-10 android.library.reference.1=../native/android