diff options
| author | 2020-10-27 06:27:12 +0000 | |
|---|---|---|
| committer | 2020-10-27 06:27:12 +0000 | |
| commit | 07bc11722b688b749c6f40c63c76f11149dc583c (patch) | |
| tree | 08052af05b434ab78149a3dc1567d2041d2de589 | |
| parent | 578b5f06c69c2277e22dbacff0e9769189682181 (diff) | |
| parent | 39143a941fcf8b252b2fcafb3fd0aa67c8f16ded (diff) | |
Merge "Fix path conflict for vendor_ramdisk_available"
| -rw-r--r-- | android/paths.go | 6 | ||||
| -rw-r--r-- | cc/cc.go | 12 | ||||
| -rw-r--r-- | etc/prebuilt_etc.go | 8 | ||||
| -rw-r--r-- | sh/sh_binary.go | 8 |
4 files changed, 31 insertions, 3 deletions
diff --git a/android/paths.go b/android/paths.go index a056ad4bc..2fb5f25af 100644 --- a/android/paths.go +++ b/android/paths.go @@ -1402,8 +1402,12 @@ func modulePartition(ctx ModuleInstallPathContext, os OsType) string { partition += "/system" } } else if ctx.InstallInVendorRamdisk() { + // The module is only available after switching root into + // /first_stage_ramdisk. To expose the module before switching root + // on a device without a dedicated recovery partition, install the + // recovery variant. if ctx.DeviceConfig().BoardMoveRecoveryResourcesToVendorBoot() { - partition = "recovery/root/first_stage_ramdisk" + partition = "vendor-ramdisk/first_stage_ramdisk" } else { partition = "vendor-ramdisk" } @@ -255,10 +255,18 @@ type BaseProperties struct { // file Logtags []string - // Make this module available when building for ramdisk + // Make this module available when building for ramdisk. + // On device without a dedicated recovery partition, the module is only + // available after switching root into + // /first_stage_ramdisk. To expose the module before switching root, install + // the recovery variant instead. Ramdisk_available *bool - // Make this module available when building for vendor ramdisk + // Make this module available when building for vendor ramdisk. + // On device without a dedicated recovery partition, the module is only + // available after switching root into + // /first_stage_ramdisk. To expose the module before switching root, install + // the recovery variant instead. Vendor_ramdisk_available *bool // Make this module available when building for recovery diff --git a/etc/prebuilt_etc.go b/etc/prebuilt_etc.go index 337ad88f2..44b814954 100644 --- a/etc/prebuilt_etc.go +++ b/etc/prebuilt_etc.go @@ -59,9 +59,17 @@ type prebuiltEtcProperties struct { Filename_from_src *bool `android:"arch_variant"` // Make this module available when building for ramdisk. + // On device without a dedicated recovery partition, the module is only + // available after switching root into + // /first_stage_ramdisk. To expose the module before switching root, install + // the recovery variant instead. Ramdisk_available *bool // Make this module available when building for vendor ramdisk. + // On device without a dedicated recovery partition, the module is only + // available after switching root into + // /first_stage_ramdisk. To expose the module before switching root, install + // the recovery variant instead. Vendor_ramdisk_available *bool // Make this module available when building for recovery. diff --git a/sh/sh_binary.go b/sh/sh_binary.go index 6f40ae489..7e5c3440a 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -66,9 +66,17 @@ type shBinaryProperties struct { Symlinks []string `android:"arch_variant"` // Make this module available when building for ramdisk. + // On device without a dedicated recovery partition, the module is only + // available after switching root into + // /first_stage_ramdisk. To expose the module before switching root, install + // the recovery variant instead. Ramdisk_available *bool // Make this module available when building for vendor ramdisk. + // On device without a dedicated recovery partition, the module is only + // available after switching root into + // /first_stage_ramdisk. To expose the module before switching root, install + // the recovery variant instead. Vendor_ramdisk_available *bool // Make this module available when building for recovery. |