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

Revert "Move odexes of non-system apps into system_other"

Browse Source 
This reverts commit 12b8d427c7.

Bug: 142537657
Test: No
Change-Id: Iefd882ec11c060877671f5bf0f2429ba4d811f8b
Merged-In: Iefd882ec11c060877671f5bf0f2429ba4d811f8b
This commit is contained in:
Anton Hansson
2019-10-14 16:53:02 +01:00
parent cea93afe76
commit d57bd3c84f
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
dexpreopt/dexpreopt.go
View File

@@ -495,8 +495,7 @@ func OdexOnSystemOtherByName(name string, dexLocation string, global GlobalConfi
}
for _, f := range global.PatternsOnSystemOther {
// See comment of SYSTEM_OTHER_ODEX_FILTER for details on the matching.
if makefileMatch("/"+f, dexLocation) || makefileMatch(filepath.Join(SystemPartition, f), dexLocation) {
if makefileMatch(filepath.Join(SystemPartition, f), dexLocation) {
return true
}
}

5
dexpreopt/dexpreopt_test.go
View File

@@ -104,12 +104,13 @@ func TestDexPreoptSystemOther(t *testing.T) {
{module: productModule, expectedPartition: "product"},
},
},
// product/app/% only applies to product apps inside the system partition
{
patterns: []string{"app/%", "product/app/%"},
moduleTests: []moduleTest{
{module: systemModule, expectedPartition: "system_other/system"},
{module: systemProductModule, expectedPartition: "system_other/system/product"},
{module: productModule, expectedPartition: "system_other/product"},
{module: productModule, expectedPartition: "product"},
},
},
}
@@ -129,7 +130,7 @@ func TestDexPreoptSystemOther(t *testing.T) {
}
if rule.Installs().String() != wantInstalls.String() {
t.Errorf("\npatterns: %v\nwant installs:\n %v\ngot:\n %v", test.patterns, wantInstalls, rule.Installs())
t.Errorf("\nwant installs:\n %v\ngot:\n %v", wantInstalls, rule.Installs())
}
}
}