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

Export RRO resource dirs from static android_library dependencies

Browse Source 
RRO dirs from static android_library dependencies should be
included in the final module.

Bug: 123510624
Test: TestEnforceRRO
Change-Id: I28c45e139b187894a4ebc43d573eab5ea1be9861
This commit is contained in:
Colin Cross
2019-01-31 11:42:41 -08:00
committed by Anton Hansson
parent 6ed7deaf33
commit c1c3755b39
3 changed files with 32 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/app_test.go
View File

@@ -150,8 +150,13 @@ func TestEnforceRRO(t *testing.T) {
"device/vendor/blah/overlay/bar/res/values/strings.xml",
},
},
rroDirs: map[string][]string{
"foo": []string{"device/vendor/blah/overlay/foo/res"},
"foo": []string{
"device/vendor/blah/overlay/foo/res",
// Enforce RRO on "foo" could imply RRO on static dependencies, but for now it doesn't.
// "device/vendor/blah/overlay/lib/res",
},
"bar": nil,
},
},
@@ -172,7 +177,10 @@ func TestEnforceRRO(t *testing.T) {
"bar": []string{"device/vendor/blah/static_overlay/bar/res/values/strings.xml"},
},
rroDirs: map[string][]string{
"foo": []string{"device/vendor/blah/overlay/foo/res"},
"foo": []string{
"device/vendor/blah/overlay/foo/res",
"device/vendor/blah/overlay/lib/res",
},
"bar": []string{"device/vendor/blah/overlay/bar/res"},
},
},