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

am 4c49f4e3: am bf95b308: Merge change 26996 into eclair

Browse Source 
Merge commit '4c49f4e36c555987d3f6dcf0f7ecfda8ae893282'

* commit '4c49f4e36c555987d3f6dcf0f7ecfda8ae893282':
  JarUtils: Ignore visual source safe files in resources
This commit is contained in:
Raphael
2009-09-25 11:17:13 -07:00
committed by Android Git Automerger
parent 6cb3fbc5a5 4c49f4e36c
commit 52169d925c
1 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,10 +45,10 @@ public class JavaResourceFilter implements IZipEntryFilter {
// get the file name from the path // get the file name from the path
String fileName = segments[segments.length-1]; String fileName = segments[segments.length-1];
return checkFileForPackaging(fileName); return checkFileForPackaging(fileName);
} }
/** /**
* Checks whether a folder and its content is valid for packaging into the .apk as * Checks whether a folder and its content is valid for packaging into the .apk as
* standard Java resource. * standard Java resource.
@@ -84,13 +84,14 @@ 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, String extension) { public static boolean checkFileForPackaging(String fileName, String extension) {
return "aidl".equalsIgnoreCase(extension) == false && return "aidl".equalsIgnoreCase(extension) == false && // Aidl files
"java".equalsIgnoreCase(extension) == false && "java".equalsIgnoreCase(extension) == false && // Java files
"class".equalsIgnoreCase(extension) == false && "class".equalsIgnoreCase(extension) == false && // Java class files
"package.html".equalsIgnoreCase(fileName) == false && "scc".equalsIgnoreCase(extension) == false && // VisualSourceSafe
"overview.html".equalsIgnoreCase(fileName) == false && "package.html".equalsIgnoreCase(fileName) == false && // Javadoc
".cvsignore".equalsIgnoreCase(fileName) == false && "overview.html".equalsIgnoreCase(fileName) == false && // Javadoc
".DS_Store".equals(fileName) == false && ".cvsignore".equalsIgnoreCase(fileName) == false && // CVS
fileName.charAt(fileName.length()-1) != '~'; ".DS_Store".equals(fileName) == false && // Mac resources
fileName.charAt(fileName.length()-1) != '~'; // Backup files
} }
} }