From 86ebe3916e42855a5bfd0371910da2db3552453c Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 30 Nov 2014 22:51:40 -0800 Subject: [PATCH 1/2] Android: Ignore some generated files. /obj/ is used by ndk debugging (gdb) in some scenarios. --- Source/Android/.gitignore | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Source/Android/.gitignore b/Source/Android/.gitignore index 199d55ebb4..22225534d3 100644 --- a/Source/Android/.gitignore +++ b/Source/Android/.gitignore @@ -9,8 +9,13 @@ *.class # generated files -bin/ -gen/ +/bin/ +/gen/ +/libs/ +/obj/ + +# Copied by cmake +/assets/ # Local configuration file (sdk path, etc) local.properties From 43d48809c4144f917e9d58c71957dd9f2a144d23 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 30 Nov 2014 23:01:00 -0800 Subject: [PATCH 2/2] Android: also ignore the libs left on the root. Although, I don't really see why they are put here, outside the build dir. --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 055294483d..43bce7efc0 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,8 @@ Source/Core/Common/scmrev.h /[Bb]uild*/ /[Bb]inary/ /obj/ +# Android cmake builds to here then copies to Source/Android. +/libs/ # Ignore various files created by visual studio/msbuild *.ipch *.opensdf