From d57bd3c84f50b5cf7103c6998524e47b9f8bc93c Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Mon, 14 Oct 2019 16:53:02 +0100 Subject: [PATCH] Revert "Move odexes of non-system apps into system_other" This reverts commit 12b8d427c799de0ff38fea4c71729b794b84eec6. Bug: 142537657 Test: No Change-Id: Iefd882ec11c060877671f5bf0f2429ba4d811f8b Merged-In: Iefd882ec11c060877671f5bf0f2429ba4d811f8b --- dexpreopt/dexpreopt.go | 3 +-- dexpreopt/dexpreopt_test.go | 5 +++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dexpreopt/dexpreopt.go b/dexpreopt/dexpreopt.go index 40986c344..ee04dfd6d 100644 --- a/dexpreopt/dexpreopt.go +++ b/dexpreopt/dexpreopt.go @@ -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 } } diff --git a/dexpreopt/dexpreopt_test.go b/dexpreopt/dexpreopt_test.go index 254be0aa1..3264d6a38 100644 --- a/dexpreopt/dexpreopt_test.go +++ b/dexpreopt/dexpreopt_test.go @@ -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()) } } }