Merge "Fix path conflict for vendor_ramdisk_available" (07bc1172) · Commits · e / os / android_build_soong

android/paths.go

+5 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1402,8 +1402,12 @@ func modulePartition(ctx ModuleInstallPathContext, os OsType) string {
	partition += "/system"		partition += "/system"
	}		}
	} else if ctx.InstallInVendorRamdisk() {		} 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() {		if ctx.DeviceConfig().BoardMoveRecoveryResourcesToVendorBoot() {
	partition = "recovery/root/first_stage_ramdisk"		partition = "vendor-ramdisk/first_stage_ramdisk"
	} else {		} else {
	partition = "vendor-ramdisk"		partition = "vendor-ramdisk"
	}		}

+10 −2

Original line number	Original line	Diff line number	Diff line
	@@ -255,10 +255,18 @@ type BaseProperties struct {
	// file		// file
	Logtags []string		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		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		Vendor_ramdisk_available *bool

	// Make this module available when building for recovery		// Make this module available when building for recovery

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -59,9 +59,17 @@ type prebuiltEtcProperties struct {
	Filename_from_src *bool `android:"arch_variant"`		Filename_from_src *bool `android:"arch_variant"`

	// 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		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		Vendor_ramdisk_available *bool

	// Make this module available when building for recovery.		// Make this module available when building for recovery.

+8 −0

Original line number	Original line	Diff line number	Diff line
	@@ -66,9 +66,17 @@ type shBinaryProperties struct {
	Symlinks []string `android:"arch_variant"`		Symlinks []string `android:"arch_variant"`

	// 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		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		Vendor_ramdisk_available *bool

	// Make this module available when building for recovery.		// Make this module available when building for recovery.