am feb37734: am 98f3c372: am 7d0891ef: am def0e542: Remove the disk partition size hardware properties.

Merge commit 'feb377343c836010839c09899215ae35eef64908'

* commit 'feb377343c836010839c09899215ae35eef64908':
  Remove the disk partition size hardware properties.

4 files changed, 4 insertions, 55 deletions

diff --git a/CHANGES.TXT b/CHANGES.TXT
index 09b1e66..a91d6d6 100644
--- a/CHANGES.TXT
+++ b/CHANGES.TXT
@@ -30,28 +30,6 @@ IMPORTANT BUG FIXES:
 
 OTHER:
 
-- Added two new hardware properties disk.systemPartition.size and
-  disk.dataPartition.size to specify the size of the system and data partition
-  in a given AVD.
-
-  If the emulator detects that an image file is larger than the corresponding
-  setting, it will do the following:
-
-    - for AVDs running from the SDK, an error message will be printed and
-      the emulator aborts. Note that this can only happen if there are some
-      serious mis-configuration of AVDs anyway.
-
-    - when launching the emulator from the Android build system, a warning
-      will be printed, and the partition size will be automatically adjusted
-      at launch.
-
-  Previously, trying to launch an over-sized system image would result in the
-  emulated system booting, but then failing to find certain files, depending on
-  how the yaffs2 disk images are built. This caused hard-to-debug issues.
-
-  Note that the option -partition-size <size> can be used to override the AVD's
-  setting at runtime.
-
 - Sources have been refreshed by a large integration of upstream QEMU
   sources (version 0.10.50). The integration is based on the following commit,
   dated 2009-06-19:
diff --git a/android/avd/hardware-properties.ini b/android/avd/hardware-properties.ini
index b3e486b..615c758 100644
--- a/android/avd/hardware-properties.ini
+++ b/android/avd/hardware-properties.ini
@@ -124,18 +124,6 @@ default     = yes
 abstract    = SD Card support
 description = Whether the device supports insertion/removal of virtual SD Cards.
 
-# System partition
-name        = disk.systemPartition.size
-type        = diskSize
-abstract    = System partition size
-default     = 72MB
-
-# Data partition
-name        = disk.dataPartition.size
-type        = diskSize
-abstract    = Data partition size
-default     = 66MB
-
 # Cache partition
 name        = disk.cachePartition
 type        = boolean
diff --git a/android/avd/hw-config-defs.h b/android/avd/hw-config-defs.h
index 069ae23..77cb8fe 100644
--- a/android/avd/hw-config-defs.h
+++ b/android/avd/hw-config-defs.h
@@ -122,20 +122,6 @@ HWCFG_BOOL(
   "SD Card support",
   "Whether the device supports insertion/removal of virtual SD Cards.")
 
-HWCFG_DISKSIZE(
-  disk_systemPartition_size,
-  "disk.systemPartition.size",
-  "72MB",
-  "System partition size",
-  "")
-
-HWCFG_DISKSIZE(
-  disk_dataPartition_size,
-  "disk.dataPartition.size",
-  "66MB",
-  "Data partition size",
-  "")
-
 HWCFG_BOOL(
   disk_cachePartition,
   "disk.cachePartition",
diff --git a/android/main.c b/android/main.c
index 6f73571..6e467b9 100644
--- a/android/main.c
+++ b/android/main.c
@@ -1772,12 +1772,9 @@ _adjustPartitionSize( const char*  description,
         snprintf(temp, sizeof temp, "(%lld bytes > %lld bytes)", imageBytes, defaultBytes);
     }
 
-    if (!inAndroidBuild) {
-        derror("%s image file too large for device's hardware configuration %s.\n"
-            "Aborting !", description, temp);
-        exit(1);
+    if (inAndroidBuild) {
+        dwarning("%s partition size adjusted to match image file %s\n", description, temp);
     }
-    dwarning("%s partition size adjusted to match image file %s\n", description, temp);
 
     return convertMBToBytes(imageMB);
 }
@@ -2389,7 +2386,7 @@ int main(int argc, char **argv)
      */
     {
         uint64_t   systemBytes  = avdInfo_getImageFileSize(avd, AVD_IMAGE_INITSYSTEM);
-        uint64_t   defaultBytes = hw->disk_systemPartition_size;
+        uint64_t   defaultBytes = defaultPartitionSize;
 
         if (defaultBytes == 0 || opts->partition_size)
             defaultBytes = defaultPartitionSize;
@@ -2405,7 +2402,7 @@ int main(int argc, char **argv)
 
     {
         const char*  dataPath     = avdInfo_getImageFile(avd, AVD_IMAGE_USERDATA);
-        uint64_t     defaultBytes = hw->disk_dataPartition_size;
+        uint64_t     defaultBytes = defaultPartitionSize;
 
         if (defaultBytes == 0 || opts->partition_size)
             defaultBytes = defaultPartitionSize;