[android] Separated .gitignore for Android

3 files changed, 38 insertions, 89 deletions

diff --git a/.gitignore b/.gitignore
index a144377ffe..dcc07b3c38 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+# Please use android/.gitignore for all Android stuff
+
 syntax: glob
 *~
 .DS_Store
@@ -63,79 +65,6 @@ bada/Maps/Res
 bada/Maps/Home
 bada/Maps/*.zip
 
-# android temporal
-mobile_api
-
-# android
-android/bin
-android/gen
-android/libs/*/
-android/obj
-android/.settings
-android/.classpath
-android/.cproject
-android/.project
-android/local.properties
-android/lint.xml
-.idea/
-# local android scripts, such as debugger helper scrips
-android/local
-# ignore flags symlinks
-android/res/drawable-xhdpi/??.png
-android/res/drawable-xhdpi/do_hack.png
-android/res/drawable-xhdpi/uk_england.png
-android/res/drawable-xhdpi/uk_northern_ireland.png
-android/res/drawable-xhdpi/uk_scotland.png
-android/res/drawable-xhdpi/uk_wales.png
-android/res/drawable-mdpi/??.png
-android/res/drawable-mdpi/do_hack.png
-android/res/drawable-mdpi/uk_england.png
-android/res/drawable-mdpi/uk_northern_ireland.png
-android/res/drawable-mdpi/uk_scotland.png
-android/res/drawable-mdpi/uk_wales.png
-
-# android MapsWithMeLite
-android/MapsWithMeLite/bin
-android/MapsWithMeLite/gen
-android/MapsWithMeLite/libs
-android/MapsWithMeLite/obj
-android/MapsWithMeLite/.settings
-android/MapsWithMeLite/.classpath
-android/MapsWithMeLite/.cproject
-android/MapsWithMeLite/.project
-android/MapsWithMeLite/assets
-android/MapsWithMeLite/local.properties
-# local android scripts, such as debugger helper scrips
-android/MapsWithMeLite/local
-
-# android MapsWithMeLite.Samsung
-android/MapsWithMeLite.Samsung/bin
-android/MapsWithMeLite.Samsung/gen
-android/MapsWithMeLite.Samsung/libs
-android/MapsWithMeLite.Samsung/obj
-android/MapsWithMeLite.Samsung/.settings
-android/MapsWithMeLite.Samsung/.classpath
-android/MapsWithMeLite.Samsung/.cproject
-android/MapsWithMeLite.Samsung/.project
-android/MapsWithMeLite.Samsung/assets
-android/MapsWithMeLite.Samsung/local.properties
-# local android scripts, such as debugger helper scrips
-android/MapsWithMeLite.Samsung/local
-
-# android MapsWithMePro
-android/MapsWithMePro/bin
-android/MapsWithMePro/gen
-android/MapsWithMePro/libs
-android/MapsWithMePro/obj
-android/MapsWithMePro/.settings
-android/MapsWithMePro/.classpath
-android/MapsWithMePro/.cproject
-android/MapsWithMePro/.project
-android/MapsWithMePro/assets
-android/MapsWithMePro/local.properties
-# local android scripts, such as debugger helper scrips
-android/MapsWithMePro/local
-
 # data
 data/intermediate_data
 data/*.mwm
@@ -171,11 +100,6 @@ qtc_packaging
 
 tools/twine/.git
 
-syntax: regexp
-(.*/)?\#[^/]*\#$
-android/YoPme/.gradletasknamecache
-android/.gradletasknamecache
-
 # shader preprocessing moc files
 drape/shader_def.hpp
 drape/shader_def.cpp
diff --git a/android/.gitignore b/android/.gitignore
index 4d5ecd0bc1..90f8a47db8 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -1,14 +1,16 @@
-bin/
-gen/
-.settings/
-resbuilder/
-spoon-output/
-assets/
-obj/
-.gradle/
-build/
+bin
+gen
+libs
+.settings
+resbuilder
+spoon-output
+obj
+local
+.gradle
+build
 3rd_party/api-android/
-RELEASE/
+RELEASE
+.idea
 
 *.class
 .classpath
@@ -16,3 +18,27 @@ RELEASE/
 .project
 local.properties
 lint.xml
+.gradletasknamecache
+
+# ignore flags symlinks
+res/drawable-xhdpi/??.png
+res/drawable-xhdpi/do_hack.png
+res/drawable-xhdpi/uk_england.png
+res/drawable-xhdpi/uk_northern_ireland.png
+res/drawable-xhdpi/uk_scotland.png
+res/drawable-xhdpi/uk_wales.png
+res/drawable-mdpi/??.png
+res/drawable-mdpi/do_hack.png
+res/drawable-mdpi/uk_england.png
+res/drawable-mdpi/uk_northern_ireland.png
+res/drawable-mdpi/uk_scotland.png
+res/drawable-mdpi/uk_wales.png
+
+MapsWithMeLite/assets
+
+MapsWithMeLite.Samsung/assets/*
+!MapsWithMeLite.Samsung/assets/promo_disclaimer.html
+
+MapsWithMePro/assets
+
+Yopme/assets
diff --git a/android/YoPme/.gitignore b/android/YoPme/.gitignore
deleted file mode 100644
index a93e887bab..0000000000
--- a/android/YoPme/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-libs