Ignore hidden files and vi swap files during packaging. (do not merge)
BUG #2233458
This is integrated from eclair.
diff --git a/tools/jarutils/src/com/android/jarutils/JavaResourceFilter.java b/tools/jarutils/src/com/android/jarutils/JavaResourceFilter.java
index 1a97e28..8678510 100644
--- a/tools/jarutils/src/com/android/jarutils/JavaResourceFilter.java
+++ b/tools/jarutils/src/com/android/jarutils/JavaResourceFilter.java
@@ -83,11 +83,17 @@
* @param extension the extension of the file (excluding '.')
* @return true if the file should be packaged as standard java resources.
*/
- public static boolean checkFileForPackaging(String fileName, String extension) {
+ public static boolean checkFileForPackaging(String fileName, String extension) {
+ // Note: this method is used by com.android.ide.eclipse.adt.internal.build.ApkBuilder
+ if (fileName.charAt(0) == '.') { // ignore hidden files.
+ return false;
+ }
+
return "aidl".equalsIgnoreCase(extension) == false && // Aidl files
"java".equalsIgnoreCase(extension) == false && // Java files
"class".equalsIgnoreCase(extension) == false && // Java class files
"scc".equalsIgnoreCase(extension) == false && // VisualSourceSafe
+ "swp".equalsIgnoreCase(extension) == false && // vi swap file
"package.html".equalsIgnoreCase(fileName) == false && // Javadoc
"overview.html".equalsIgnoreCase(fileName) == false && // Javadoc
".cvsignore".equalsIgnoreCase(fileName) == false && // CVS
