openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename resource_dirs to java_resource_dirs 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
androidmk/cmd/androidmk/android.go
View File

@ -107,7 +107,7 @@ func init() {
"LOCAL_RENDERSCRIPT_INCLUDES": "renderscript.include_dirs", "LOCAL_RENDERSCRIPT_INCLUDES": "renderscript.include_dirs",
"LOCAL_RENDERSCRIPT_FLAGS": "renderscript.flags", "LOCAL_RENDERSCRIPT_FLAGS": "renderscript.flags",
"LOCAL_JAVA_RESOURCE_DIRS": "resource_dirs", "LOCAL_JAVA_RESOURCE_DIRS": "java_resource_dirs",
"LOCAL_JAVACFLAGS": "javacflags", "LOCAL_JAVACFLAGS": "javacflags",
"LOCAL_DX_FLAGS": "dxflags", "LOCAL_DX_FLAGS": "dxflags",
"LOCAL_JAVA_LIBRARIES": "libs", "LOCAL_JAVA_LIBRARIES": "libs",

6
java/app.go
View File

@ -53,8 +53,8 @@ type androidAppProperties struct {
Asset_dirs []string Asset_dirs []string
// list of directories relative to the Blueprints file containing // list of directories relative to the Blueprints file containing
// Java resources // Android resources
Android_resource_dirs []string Resource_dirs []string
} }
type AndroidApp struct { type AndroidApp struct {
@ -183,7 +183,7 @@ func (a *AndroidApp) aaptFlags(ctx android.ModuleContext) ([]string, android.Pat
} }
assetDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.appProperties.Asset_dirs, "assets") assetDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.appProperties.Asset_dirs, "assets")
resourceDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.appProperties.Android_resource_dirs, "res") resourceDirs := android.PathsWithOptionalDefaultForModuleSrc(ctx, a.appProperties.Resource_dirs, "res")
var overlayResourceDirs android.Paths var overlayResourceDirs android.Paths
// For every resource directory, check if there is an overlay directory with the same path. // For every resource directory, check if there is an overlay directory with the same path.

8
java/java.go
View File

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