LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am f31f6303: Merge change If0d0751e into eclair

Browse Source 
Merge commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0' into eclair-mr2

* commit 'f31f630320a53e067ead2848d24ff63b0e0ad3b0':
  Ignore hidden files and vi swap files during packaging.
This commit is contained in:
Xavier Ducrohet
2009-11-02 23:16:41 -08:00
committed by Android Git Automerger
parent 56af356a42 f31f630320
commit 35d140afb4
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/jarutils/src/com/android/jarutils/JavaResourceFilter.java
View File

@@ -68,6 +68,10 @@ public class JavaResourceFilter implements IZipEntryFilter {
* @return true if the file should be packaged as standard java resources. * @return true if the file should be packaged as standard java resources.
*/ */
public static boolean checkFileForPackaging(String fileName) { public static boolean checkFileForPackaging(String fileName) {
if (fileName.charAt(0) == '.') { // ignore hidden files.
return false;
}
String[] fileSegments = fileName.split("\\."); String[] fileSegments = fileName.split("\\.");
String fileExt = ""; String fileExt = "";
if (fileSegments.length > 1) { if (fileSegments.length > 1) {
@@ -83,11 +87,12 @@ public class JavaResourceFilter implements IZipEntryFilter {
* @param extension the extension of the file (excluding '.') * @param extension the extension of the file (excluding '.')
* @return true if the file should be packaged as standard java resources. * @return true if the file should be packaged as standard java resources.
*/ */
public static boolean checkFileForPackaging(String fileName, String extension) { private static boolean checkFileForPackaging(String fileName, String extension) {
return "aidl".equalsIgnoreCase(extension) == false && // Aidl files return "aidl".equalsIgnoreCase(extension) == false && // Aidl files
"java".equalsIgnoreCase(extension) == false && // Java files "java".equalsIgnoreCase(extension) == false && // Java files
"class".equalsIgnoreCase(extension) == false && // Java class files "class".equalsIgnoreCase(extension) == false && // Java class files
"scc".equalsIgnoreCase(extension) == false && // VisualSourceSafe "scc".equalsIgnoreCase(extension) == false && // VisualSourceSafe
"swp".equalsIgnoreCase(extension) == false && // vi swap file
"package.html".equalsIgnoreCase(fileName) == false && // Javadoc "package.html".equalsIgnoreCase(fileName) == false && // Javadoc
"overview.html".equalsIgnoreCase(fileName) == false && // Javadoc "overview.html".equalsIgnoreCase(fileName) == false && // Javadoc
".cvsignore".equalsIgnoreCase(fileName) == false && // CVS ".cvsignore".equalsIgnoreCase(fileName) == false && // CVS