openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Add partition subdirs to system_other"

This commit is contained in:
Anton Hansson 2019-10-04 06:30:55 +00:00 committed by Gerrit Code Review
parent 92e03dfb3e 43ab0bc24a
commit 332f35fc92
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dexpreopt/dexpreopt.go
View File

@ -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")) odexPath := module.BuildPath.InSameDir(ctx, "oat", arch.String(), pathtools.ReplaceExtension(base, "odex"))
odexInstallPath := toOdexPath(module.DexLocation) odexInstallPath := toOdexPath(module.DexLocation)
if odexOnSystemOther(module, global) { if odexOnSystemOther(module, global) {
odexInstallPath = strings.Replace(odexInstallPath, SystemPartition, SystemOtherPartition, 1) odexInstallPath = filepath.Join(SystemOtherPartition, odexInstallPath)
} }
vdexPath := odexPath.ReplaceExtension(ctx, "vdex") vdexPath := odexPath.ReplaceExtension(ctx, "vdex")

6
dexpreopt/dexpreopt_test.go
View File

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