diff options
| author | 2025-03-07 12:40:25 -0800 | |
|---|---|---|
| committer | 2025-03-07 12:40:25 -0800 | |
| commit | 1593b1644f196be6042befb07ca802d140cac2a2 (patch) | |
| tree | 97175908b42938b318876a9eeb5eae2ce5c0cebf /java | |
| parent | 3c0da4d4cddebec66956843a28d7eb2bddd46212 (diff) | |
| parent | 4a053d74d73a4826530d1b06be8aa5ad55212ff2 (diff) | |
Merge "Use system server jar module stem instead of its name" into main am: 4a053d74d7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3528460
Change-Id: If607f0f120d0487ca28de58716de62e7eac4771f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java')
| -rw-r--r-- | java/dexpreopt_check.go | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/java/dexpreopt_check.go b/java/dexpreopt_check.go index c97156541..9d0f539ba 100644 --- a/java/dexpreopt_check.go +++ b/java/dexpreopt_check.go @@ -100,7 +100,12 @@ func (m *dexpreoptSystemserverCheck) GenerateAndroidBuildActions(ctx android.Mod if systemServerJar.InstallInSystemExt() && ctx.Config().InstallApexSystemServerDexpreoptSamePartition() { partition = ctx.DeviceConfig().SystemExtPath() // system_ext } - dexLocation := dexpreopt.GetSystemServerDexLocation(ctx, global, systemServerJar.Name()) + var dexLocation string + if m, ok := systemServerJar.(ModuleWithStem); ok { + dexLocation = dexpreopt.GetSystemServerDexLocation(ctx, global, m.Stem()) + } else { + ctx.PropertyErrorf("dexpreopt_systemserver_check", "%v is not a ModuleWithStem", systemServerJar.Name()) + } odexLocation := dexpreopt.ToOdexPath(dexLocation, targets[0].Arch.ArchType, partition) odexPath := getInstallPath(ctx, odexLocation) vdexPath := getInstallPath(ctx, pathtools.ReplaceExtension(odexLocation, "vdex")) |