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

am 78c9bb59: am f9e0b264: Move check for hidden files in the proper method.

Browse Source 
Merge commit '78c9bb59eb3cfa92e5a13621b1efe5bd8ecbb92b' into eclair-mr2-plus-aosp

* commit '78c9bb59eb3cfa92e5a13621b1efe5bd8ecbb92b':
  Move check for hidden files in the proper method.
This commit is contained in:
Xavier Ducrohet
2009-11-03 11:44:40 -08:00
committed by Android Git Automerger
parent f2bf99c387 78c9bb59eb
commit 3a8967f62c
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,10 +68,6 @@ 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) {
@@ -87,8 +83,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) { public static boolean checkFileForPackaging(String fileName, String extension) {
// Note: this method is used by ApkBuilder // 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 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