From 9883a8931a2a21d52a3a4794d727ff8782eb33c0 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 27 Jan 2016 09:18:39 +0100 Subject: [PATCH 1/3] faketime is only needed when building, not when cleaning cleaning while running faketime will just slow it down or cause weird behavior. --- make-release-build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-release-build b/make-release-build index 6b54f741..a8aa6485 100755 --- a/make-release-build +++ b/make-release-build @@ -70,9 +70,9 @@ fi faketime "$TIMESTAMP" $ANDROID_NDK_HOME/ndk-build #clean, build, clean and build! -faketime "$TIMESTAMP" make -C external clean +make -C external clean faketime "$TIMESTAMP" APP_ABI=armeabi make -C external -faketime "$TIMESTAMP" make -C external clean +make -C external clean faketime "$TIMESTAMP" APP_ABI=x86 make -C external ./setup-ant From 20c16aec68fff1052a55272ecfc8d89c2f88da76 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 27 Jan 2016 09:36:47 +0100 Subject: [PATCH 2/3] ignore more files generated by the build --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index 53cc940f..0098ce34 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,12 @@ obj releases .transifexrc +# native build products +*.so +pdnsd +*.mp3 + # ant build products build.xml proguard-project.txt +ant.properties \ No newline at end of file From 226d92ebcd9bda9e5b9bacd40366354e4d28d610 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 27 Jan 2016 09:41:53 +0100 Subject: [PATCH 3/3] make-release-build: env vars need to be first on the command line --- make-release-build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/make-release-build b/make-release-build index a8aa6485..41166c4a 100755 --- a/make-release-build +++ b/make-release-build @@ -71,9 +71,9 @@ faketime "$TIMESTAMP" $ANDROID_NDK_HOME/ndk-build #clean, build, clean and build! make -C external clean -faketime "$TIMESTAMP" APP_ABI=armeabi make -C external +APP_ABI=armeabi faketime "$TIMESTAMP" make -C external make -C external clean -faketime "$TIMESTAMP" APP_ABI=x86 make -C external +APP_ABI=x86 faketime "$TIMESTAMP" make -C external ./setup-ant