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

6
java/app.go
View File

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