Merge "Add partition subdirs to system_other" (fe077dea) · Commits · e / os / android_build_soong

dexpreopt/dexpreopt.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -248,7 +248,7 @@ func dexpreoptCommand(ctx android.PathContext, global GlobalConfig, module Modul
		odexPath := module.BuildPath.InSameDir(ctx, "oat", arch.String(), pathtools.ReplaceExtension(base, "odex"))
		odexInstallPath := toOdexPath(module.DexLocation)
		if odexOnSystemOther(module, global) {
		odexInstallPath = strings.Replace(odexInstallPath, SystemPartition, SystemOtherPartition, 1)
		odexInstallPath = filepath.Join(SystemOtherPartition, odexInstallPath)
		}

		vdexPath := odexPath.ReplaceExtension(ctx, "vdex")

+3 −3

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ func TestDexPreoptSystemOther(t *testing.T) {
		{
		patterns: []string{"app/%"},
		moduleTests: []moduleTest{
		{module: systemModule, expectedPartition: "system_other"},
		{module: systemModule, expectedPartition: "system_other/system"},
		{module: systemProductModule, expectedPartition: "system/product"},
		{module: productModule, expectedPartition: "product"},
		},
		@@ -126,8 +126,8 @@ func TestDexPreoptSystemOther(t *testing.T) {
		{
		patterns: []string{"app/%", "product/app/%"},
		moduleTests: []moduleTest{
		{module: systemModule, expectedPartition: "system_other"},
		{module: systemProductModule, expectedPartition: "system_other/product"},
		{module: systemModule, expectedPartition: "system_other/system"},
		{module: systemProductModule, expectedPartition: "system_other/system/product"},
		{module: productModule, expectedPartition: "product"},
		},
		},