Stuff hardware configuration with paths to image / partition files

Change-Id: Id26cd578fc3faf1fee1a55f4999c3613e47c0e96

2 files changed, 153 insertions, 0 deletions

diff --git a/android/avd/hardware-properties.ini b/android/avd/hardware-properties.ini
index 89acf9f..7473e7d 100644
--- a/android/avd/hardware-properties.ini
+++ b/android/avd/hardware-properties.ini
@@ -143,6 +143,12 @@ default     = yes
 abstract    = Cache partition support
 description = Whether we use a /cache partition on the device.
 
+name        = disk.cachePartition.path
+type        = string
+default     =
+abstract    = Cache partition
+description = Cache partition to use on the device. Ignored if disk.cachePartition is not 'yes'.
+
 name        = disk.cachePartition.size
 type        = diskSize
 abstract    = Cache partition size
@@ -187,3 +193,73 @@ type        = boolean
 default     = yes
 abstract    = Proximity support
 description = Whether there is an proximity in the device.
+
+# Path to the kernel image.
+name        = disk.kernel.path
+type        = string
+default     =
+abstract    = Path to the kernel image
+description = Path to the kernel image.
+
+# Path to the ramdisk image.
+name        = disk.ramDisk.path
+type        = string
+default     =
+abstract    = Path to the ramdisk image
+description = Path to the ramdisk image.
+
+# Path to the system partition.
+name        = disk.systemPartition.path
+type        = string
+default     = <init>
+abstract    = Path to system partition image
+description = Path to read/write system partition image during emulation. If special value '<init>' is used, a temporary file will be created, populated with the content of .initPath
+
+# Initial path to the system partition.
+name        = disk.systemPartition.initPath
+type        = string
+default     =
+abstract    = Initial system partition image
+description = Only used if .path is '<init>', path to an initial system image that will be copied into the temporary system image file before launch.
+
+# System partition size.
+name        = disk.systemPartition.size
+type        = diskSize
+default     = 0
+abstract    = Ideal size of system partition
+description = ideal size of system partition. Ignored if smaller than the size of .path (or .initPath). Otherwise, gives the maximum size the partition is allowed to grow dynamically.
+
+# Path to the data partition.
+name        = disk.dataPartition.path
+type        = string
+default     = <temp>
+abstract    = Path to data partition file
+description = Path to data partition file. Cannot be empty. Special value <temp> means using a temporary file. If disk.dataPartition.initPath is not empty, its content will be copied to the disk.dataPartition.path file at boot-time.
+
+# Initial path to the data partition.
+name        = disk.dataPartition.initPath
+type        = string
+default     =
+abstract    = Initial data partition
+description = If not empty, its content will be copied to the disk.dataPartition.path file at boot-time.
+
+# Data partition size.
+name        = disk.dataPartition.size
+type        = diskSize
+default     = 0
+abstract    = Ideal size of data partition
+description = ideal size of data partition. Ignored if smaller than the size of .path (or .initPath). Otherwise, gives the maximum size the partition is allowed to grow dynamically.
+
+# Path to the snapshots partition.
+name        = disk.snapshots.path
+type        = string
+default     =
+abstract    = Path to snapshots
+description = Path to a 'snapshot storage' file, where all snapshots are stored, including the default snapshot.
+
+# Path to SD Card image file.
+name        = disk.sdCard.path
+type        = string
+default     =
+abstract    = Path to SD Card image file
+description = Path to SD Card image file. Ignored if disk.sdCard is not set to 'yes'.
diff --git a/android/avd/hw-config-defs.h b/android/avd/hw-config-defs.h
index 4afc4d7..a6cce01 100644
--- a/android/avd/hw-config-defs.h
+++ b/android/avd/hw-config-defs.h
@@ -136,6 +136,13 @@ HWCFG_BOOL(
   "Cache partition support",
   "Whether we use a /cache partition on the device.")
 
+HWCFG_STRING(
+  disk_cachePartition_path,
+  "disk.cachePartition.path",
+  "",
+  "Cache partition",
+  "Cache partition to use on the device. Ignored if disk.cachePartition is not 'yes'.")
+
 HWCFG_DISKSIZE(
   disk_cachePartition_size,
   "disk.cachePartition.size",
@@ -185,6 +192,76 @@ HWCFG_BOOL(
   "Proximity support",
   "Whether there is an proximity in the device.")
 
+HWCFG_STRING(
+  disk_kernel_path,
+  "disk.kernel.path",
+  "",
+  "Path to the kernel image",
+  "Path to the kernel image.")
+
+HWCFG_STRING(
+  disk_ramDisk_path,
+  "disk.ramDisk.path",
+  "",
+  "Path to the ramdisk image",
+  "Path to the ramdisk image.")
+
+HWCFG_STRING(
+  disk_systemPartition_path,
+  "disk.systemPartition.path",
+  "<init>",
+  "Path to system partition image",
+  "Path to read/write system partition image during emulation. If special value '<init>' is used, a temporary file will be created, populated with the content of .initPath")
+
+HWCFG_STRING(
+  disk_systemPartition_initPath,
+  "disk.systemPartition.initPath",
+  "",
+  "Initial system partition image",
+  "Only used if .path is '<init>', path to an initial system image that will be copied into the temporary system image file before launch.")
+
+HWCFG_DISKSIZE(
+  disk_systemPartition_size,
+  "disk.systemPartition.size",
+  "0",
+  "Ideal size of system partition",
+  "ideal size of system partition. Ignored if smaller than the size of .path (or .initPath). Otherwise, gives the maximum size the partition is allowed to grow dynamically.")
+
+HWCFG_STRING(
+  disk_dataPartition_path,
+  "disk.dataPartition.path",
+  "<temp>",
+  "Path to data partition file",
+  "Path to data partition file. Cannot be empty. Special value <temp> means using a temporary file. If disk.dataPartition.initPath is not empty, its content will be copied to the disk.dataPartition.path file at boot-time.")
+
+HWCFG_STRING(
+  disk_dataPartition_initPath,
+  "disk.dataPartition.initPath",
+  "",
+  "Initial data partition",
+  "If not empty, its content will be copied to the disk.dataPartition.path file at boot-time.")
+
+HWCFG_DISKSIZE(
+  disk_dataPartition_size,
+  "disk.dataPartition.size",
+  "0",
+  "Ideal size of data partition",
+  "ideal size of data partition. Ignored if smaller than the size of .path (or .initPath). Otherwise, gives the maximum size the partition is allowed to grow dynamically.")
+
+HWCFG_STRING(
+  disk_snapshots_path,
+  "disk.snapshots.path",
+  "",
+  "Path to snapshots",
+  "Path to a 'snapshot storage' file, where all snapshots are stored, including the default snapshot.")
+
+HWCFG_STRING(
+  disk_sdCard_path,
+  "disk.sdCard.path",
+  "",
+  "Path to SD Card image file",
+  "Path to SD Card image file. Ignored if disk.sdCard is not set to 'yes'.")
+
 #undef HWCFG_INT
 #undef HWCFG_BOOL
 #undef HWCFG_DISKSIZE