Support subtracting sources from globs

Support -file or -path/glob in file lists that contain globs to
subtract files from the resulting glob.  Also move source file
prefixing and handling into a common function.

Change-Id: Ib6d74ce22f53cae7348c4ba35b779976d90359a6
This commit is contained in:
Colin Cross
2015-04-08 11:21:40 -07:00
parent 1332b0035c
commit fce532760f
6 changed files with 34 additions and 16 deletions

View File

@@ -24,7 +24,6 @@ import (
"strings"
"github.com/google/blueprint"
"github.com/google/blueprint/pathtools"
"android/soong/common"
)
@@ -193,9 +192,7 @@ func (j *javaBase) GenerateJavaBuildActions(ctx common.AndroidModuleContext) {
var javacDeps []string
srcFiles := j.properties.Srcs
srcFiles = pathtools.PrefixPaths(srcFiles, common.ModuleSrcDir(ctx))
srcFiles = common.ExpandGlobs(ctx, srcFiles)
srcFiles := common.ExpandSources(ctx, j.properties.Srcs)
classpath, bootClasspath, classJarSpecs, resourceJarSpecs := j.collectDeps(ctx)