From ac22956dcb437743e0e74ba041122877394aab1b Mon Sep 17 00:00:00 2001 From: Petri Gynther Date: Tue, 2 Mar 2021 23:44:02 -0800 Subject: [PATCH] Rename vendor-ramdisk to vendor_ramdisk Rename to get consistent ramdisk directory naming in out/target/product/: debug_ramdisk ramdisk vendor_debug_ramdisk vendor_ramdisk Test: build and inspect out/target/product/ Change-Id: Ib86e6509bd910e8c95bcb6e3f7bb639ebbfe3758 --- android/paths.go | 4 ++-- ui/build/cleanbuild.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/android/paths.go b/android/paths.go index ada4da692..3f4d3f281 100644 --- a/android/paths.go +++ b/android/paths.go @@ -1662,9 +1662,9 @@ func modulePartition(ctx ModuleInstallPathContext, os OsType) string { // on a device without a dedicated recovery partition, install the // recovery variant. if ctx.DeviceConfig().BoardMoveRecoveryResourcesToVendorBoot() { - partition = "vendor-ramdisk/first_stage_ramdisk" + partition = "vendor_ramdisk/first_stage_ramdisk" } else { - partition = "vendor-ramdisk" + partition = "vendor_ramdisk" } if !ctx.InstallInRoot() { partition += "/system" diff --git a/ui/build/cleanbuild.go b/ui/build/cleanbuild.go index b1f8551ed..6ba497c3f 100644 --- a/ui/build/cleanbuild.go +++ b/ui/build/cleanbuild.go @@ -124,7 +124,7 @@ func installClean(ctx Context, config Config) { productOut("obj/PACKAGING"), productOut("ramdisk"), productOut("debug_ramdisk"), - productOut("vendor-ramdisk"), + productOut("vendor_ramdisk"), productOut("vendor_debug_ramdisk"), productOut("test_harness_ramdisk"), productOut("recovery"),