Ramdisk modules install to correct location am: 82db735fbc am: a9c9fdf5d3

Change-Id: Ifa0583b1ea35960bdde1451ca4f886afd2b4591f

android/config.go

@@ -1237,3 +1237,7 @@ func (c *deviceConfig) DeviceSecondaryArch() string {
 func (c *deviceConfig) DeviceSecondaryArchVariant() string {
 	return String(c.config.productVariables.DeviceSecondaryArchVariant)
 }
+
+func (c *deviceConfig) BoardUsesRecoveryAsBoot() bool {
+	return Bool(c.config.productVariables.BoardUsesRecoveryAsBoot)
+}

android/paths.go

@@ -1256,8 +1256,14 @@ func modulePartition(ctx ModuleInstallPathContext) string {
 	} else if ctx.InstallInTestcases() {
 		partition = "testcases"
 	} else if ctx.InstallInRamdisk() {
-		// TODO(elsk): should be conditional on RECOVERY_AS_BOOT
-		partition = "ramdisk"
+		if ctx.DeviceConfig().BoardUsesRecoveryAsBoot() {
+			partition = "recovery/root/first_stage_ramdisk"
+		} else {
+			partition = "ramdisk"
+		}
+		if !ctx.InstallInRoot() {
+			partition += "/system"
+		}
 	} else if ctx.InstallInRecovery() {
 		if ctx.InstallInRoot() {
 			partition = "recovery/root"

android/variable.go

@@ -317,6 +317,8 @@ type productVariables struct {
 	EnforceProductPartitionInterface *bool `json:",omitempty"`
 
 	InstallExtraFlattenedApexes *bool `json:",omitempty"`
+
+	BoardUsesRecoveryAsBoot *bool `json:",omitempty"`
 }
 
 func boolPtr(v bool) *bool {