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

Rename resource_dirs to java_resource_dirs

Browse Source 
For consistency with make, rename java resources to
java_resource_dirs and android resources to resource_dirs.

Test: m -j checkbuild
Change-Id: Ie9aac50fef40f6a9093b4b98759e79cd086bb797
This commit is contained in:
Colin Cross
2017-09-27 17:33:10 -07:00
parent bd42549743
commit 86a63ff366
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/java.go
View File

@@ -70,10 +70,10 @@ type CompilerProperties struct {
Exclude_srcs []string `android:"arch_variant"`
// list of directories containing Java resources
Resource_dirs []string `android:"arch_variant"`
Java_resource_dirs []string `android:"arch_variant"`
// list of directories that should be excluded from resource_dirs
Exclude_resource_dirs []string `android:"arch_variant"`
// list of directories that should be excluded from java_resource_dirs
Exclude_java_resource_dirs []string `android:"arch_variant"`
// don't build against the default libraries (legacy-test, core-junit,
// ext, and framework for device targets)
@@ -430,7 +430,7 @@ func (j *Module) compile(ctx android.ModuleContext) {
jars = append(jars, classes)
}
resourceJarSpecs := ResourceDirsToJarSpecs(ctx, j.properties.Resource_dirs, j.properties.Exclude_resource_dirs)
resourceJarSpecs := ResourceDirsToJarSpecs(ctx, j.properties.Java_resource_dirs, j.properties.Exclude_java_resource_dirs)
if len(resourceJarSpecs) > 0 {
// Combine classes + resources into classes-full-debug.jar
resourceJar := TransformResourcesToJar(ctx, resourceJarSpecs, extraJarDeps)