X-Git-Url: http://sigrok.org/gitweb/?p=sigrok-androidutils.git;a=blobdiff_plain;f=ant%2Fsrc%2Forg%2Fsigrok%2Fandroidutils%2Fant%2FCopyLibsTask.java;fp=ant%2Fsrc%2Forg%2Fsigrok%2Fandroidutils%2Fant%2FCopyLibsTask.java;h=969faf39cd4e1f9c266fc220af8260bf0aa4d3f9;hp=58cfe25d482b911a066c42dbc15911a98909e944;hb=4785171b657e9a9c938fc631ad51921148d8e574;hpb=0c38754cd357cb4a10ecf84686c7ca38926d876e diff --git a/ant/src/org/sigrok/androidutils/ant/CopyLibsTask.java b/ant/src/org/sigrok/androidutils/ant/CopyLibsTask.java index 58cfe25..969faf3 100644 --- a/ant/src/org/sigrok/androidutils/ant/CopyLibsTask.java +++ b/ant/src/org/sigrok/androidutils/ant/CopyLibsTask.java @@ -328,16 +328,22 @@ public class CopyLibsTask extends Task if (l != null) return l; boolean include = false; - for (String patt : patterns.getIncludePatterns(getProject())) { - if (SelectorUtils.match(patt, s)) { - include = true; - break; + String[] includePatterns = patterns.getIncludePatterns(getProject()); + if (includePatterns != null) { + for (String patt : includePatterns) { + if (SelectorUtils.match(patt, s)) { + include = true; + break; + } } } if (!include) { - for (String patt : patterns.getExcludePatterns(getProject())) { - if (SelectorUtils.match(patt, s)) - return null; + String[] excludePatterns = patterns.getExcludePatterns(getProject()); + if (excludePatterns != null) { + for (String patt : excludePatterns) { + if (SelectorUtils.match(patt, s)) + return null; + } } } l = findLibInRpath(s, subdir);