From 9402c8a34e63c039917575ba0eed4fc714540722 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sun, 14 Jul 2013 22:13:12 -0300 Subject: [PATCH] Ups, broke android build, now it's working again. --- .hgignore | 3 ++- projects/android-project/AndroidManifest.xml | 2 +- projects/android-project/compile.sh | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.hgignore b/.hgignore index 4ee990901..a46447556 100644 --- a/.hgignore +++ b/.hgignore @@ -12,7 +12,8 @@ syntax: regexp ^projects/android-project/gen$ ^projects/android-project/assets$ ^projects/android-project/libs$ -^projects/android-project-* +^projects/android-project-fluGL* +^projects/android-project-strobe* ^src/examples/strobe$ .*.dll eees* diff --git a/projects/android-project/AndroidManifest.xml b/projects/android-project/AndroidManifest.xml index b52dd8041..bc7551938 100644 --- a/projects/android-project/AndroidManifest.xml +++ b/projects/android-project/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/projects/android-project/compile.sh b/projects/android-project/compile.sh index f76c6dd70..e4af6bfa5 100755 --- a/projects/android-project/compile.sh +++ b/projects/android-project/compile.sh @@ -3,6 +3,7 @@ cd $(dirname "$0") export NDK_PROJECT_PATH=$(dirname "$0") ndk-build NDK_LOG=1 NDK_DEBUG=1 -j4 rm -rf ./bin +rm -rf ./gen ant debug adb install -r bin/EEPPApp-debug.apk ndk-gdb --force --start --verbose