Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d57bd3c8 authored by Anton Hansson's avatar Anton Hansson
Browse files

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

This reverts commit 12b8d427.

Bug: 142537657
Test: No
Change-Id: Iefd882ec11c060877671f5bf0f2429ba4d811f8b
Merged-In: Iefd882ec11c060877671f5bf0f2429ba4d811f8b
parent cea93afe

dexpreopt/dexpreopt.go

+1 −2
Original line number Diff line number Diff line
@@ -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

		}

	}

dexpreopt/dexpreopt_test.go

+3 −2
Original line number Diff line number Diff line
@@ -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())

			}

		}

	}