am 28bc5dc3: Merge change 5633 into donut

Merge commit '28bc5dc3078a0f02ac066ea797fad765dea65f81' * commit '28bc5dc3078a0f02ac066ea797fad765dea65f81': Remove individual .gitignore files and move their content to a single top-level one
2009-06-30 14:48:40 -07:00
parent 573548f9a6 28bc5dc307
commit 7f641edafd
4 changed files with 5 additions and 4 deletions
--- a/ndk/.gitignore
+++ b/ndk/.gitignore
@@ -0,0 +1,5 @@
+build/prebuilt
+out
+apps/*/project/libs
+.gitignore
+
--- a/ndk/apps/hello-jni/project/libs/armeabi/.gitignore
+++ b/ndk/apps/hello-jni/project/libs/armeabi/.gitignore
@@ -1 +0,0 @@
-lib*.so
--- a/ndk/apps/two-libs/project/libs/armeabi/.gitignore
+++ b/ndk/apps/two-libs/project/libs/armeabi/.gitignore
@@ -1 +0,0 @@
-lib*.so
--- a/ndk/out/.gitignore
+++ b/ndk/out/.gitignore
@@ -1,2 +0,0 @@
-# Ignore all generated files here
-*