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

Merge "Install dexpreopt artifacts of non_system apps in system_other" into main

Browse Source
This commit is contained in:
Spandan Das
2024-06-28 16:14:57 +00:00
committed by Gerrit Code Review
parent 6a66b08bad a2e7d238e7
commit 09a1f585d1
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dexpreopt/dexpreopt.go
View File

@@ -532,7 +532,7 @@ func OdexOnSystemOtherByName(name string, dexLocation string, global *GlobalConf
}
for _, f := range global.PatternsOnSystemOther {
if makefileMatch(filepath.Join(SystemPartition, f), dexLocation) {
if makefileMatch("/" + f, dexLocation) || makefileMatch(filepath.Join(SystemPartition, f), dexLocation) {
return true
}
}

2
dexpreopt/dexpreopt_test.go
View File

@@ -153,7 +153,7 @@ func TestDexPreoptSystemOther(t *testing.T) {
moduleTests: []moduleTest{
{module: systemModule, expectedPartition: "system_other/system"},
{module: systemProductModule, expectedPartition: "system_other/system/product"},
{module: productModule, expectedPartition: "product"},
{module: productModule, expectedPartition: "system_other/product"},
},
},
}