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

Fix ordering of overlays

Browse Source 
am: 68a7023436

Change-Id: I39cc6eb00b4a9d9607ad689472de96ae8273bbbb
This commit is contained in:
Colin Cross
2018-01-05 03:09:05 +00:00
committed by android-build-merger
parent b88d9eedb4 68a7023436
commit 88f36bb683
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
java/app.go
View File

@@ -412,7 +412,11 @@ func (overlaySingleton) GenerateBuildActions(ctx android.SingletonContext) {
} }
var overlayData []overlayGlobResult var overlayData []overlayGlobResult
for _, overlay := range ctx.Config().ResourceOverlays() { overlayDirs := ctx.Config().ResourceOverlays()
for i := range overlayDirs {
// Iterate backwards through the list of overlay directories so that the later, lower-priority
// directories in the list show up earlier in the command line to aapt2.
overlay := overlayDirs[len(overlayDirs)-1-i]
var result overlayGlobResult var result overlayGlobResult
result.dir = overlay result.dir = overlay

6
java/app_test.go
View File

@@ -111,13 +111,13 @@ var testEnforceRROTests = []struct {
enforceRROTargets: nil, enforceRROTargets: nil,
enforceRROExcludedOverlays: nil, enforceRROExcludedOverlays: nil,
fooOverlayFiles: []string{ fooOverlayFiles: []string{
"device/vendor/blah/overlay/foo/res/values/strings.xml",
"device/vendor/blah/static_overlay/foo/res/values/strings.xml", "device/vendor/blah/static_overlay/foo/res/values/strings.xml",
"device/vendor/blah/overlay/foo/res/values/strings.xml",
}, },
fooRRODirs: nil, fooRRODirs: nil,
barOverlayFiles: []string{ barOverlayFiles: []string{
"device/vendor/blah/overlay/bar/res/values/strings.xml",
"device/vendor/blah/static_overlay/bar/res/values/strings.xml", "device/vendor/blah/static_overlay/bar/res/values/strings.xml",
"device/vendor/blah/overlay/bar/res/values/strings.xml",
}, },
barRRODirs: nil, barRRODirs: nil,
}, },
@@ -132,8 +132,8 @@ var testEnforceRROTests = []struct {
"device/vendor/blah/overlay/foo/res", "device/vendor/blah/overlay/foo/res",
}, },
barOverlayFiles: []string{ barOverlayFiles: []string{
"device/vendor/blah/overlay/bar/res/values/strings.xml",
"device/vendor/blah/static_overlay/bar/res/values/strings.xml", "device/vendor/blah/static_overlay/bar/res/values/strings.xml",
"device/vendor/blah/overlay/bar/res/values/strings.xml",
}, },
barRRODirs: nil, barRRODirs: nil,
}, },