StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Honor resource exclusions in java_resources properties

Browse Source 
Honor the default resource exclusions in java_resources properties
including *.java.

Test: m -j checkbuild
Change-Id: Ia117a000680161b54c189758926ddb2068a2a2c3
This commit is contained in:
Colin Cross
2017-10-03 13:14:07 -07:00
parent 7db5d6332f
commit 2372923fe0
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/java.go
View File

@@ -481,7 +481,7 @@ func (j *Module) compile(ctx android.ModuleContext) {
resDeps = append(resDeps, fileDeps...)
if proptools.Bool(j.properties.Include_srcs) {
srcArgs, srcDeps := ResourceFilesToJarArgs(ctx, j.properties.Srcs, j.properties.Exclude_srcs)
srcArgs, srcDeps := SourceFilesToJarArgs(ctx, j.properties.Srcs, j.properties.Exclude_srcs)
resArgs = append(resArgs, srcArgs...)
resDeps = append(resDeps, srcDeps...)
}

19
java/resources.go
View File

@@ -75,8 +75,27 @@ func ResourceDirsToJarArgs(ctx android.ModuleContext,
return args, deps
}
// Convert java_resources properties to arguments to soong_zip -jar, ignoring common patterns
// that should not be treated as resources (including *.java).
func ResourceFilesToJarArgs(ctx android.ModuleContext,
res, exclude []string) (args []string, deps android.Paths) {
exclude = append([]string(nil), exclude...)
exclude = append(exclude, resourceExcludes...)
return resourceFilesToJarArgs(ctx, res, exclude)
}
// Convert java_resources properties to arguments to soong_zip -jar, keeping files that should
// normally not used as resources like *.java
func SourceFilesToJarArgs(ctx android.ModuleContext,
res, exclude []string) (args []string, deps android.Paths) {
return resourceFilesToJarArgs(ctx, res, exclude)
}
func resourceFilesToJarArgs(ctx android.ModuleContext,
res, exclude []string) (args []string, deps android.Paths) {
files := ctx.ExpandSources(res, exclude)
for _, f := range files {