Move cache partition initialization to core.

Change-Id: I1f887e6f8fc38e43b1fff3f7bab3814b52542762

2 files changed, 19 insertions, 33 deletions

diff --git a/android/avd/info.c b/android/avd/info.c
index fa32c24..aad316a 100644
--- a/android/avd/info.c
+++ b/android/avd/info.c
@@ -1130,8 +1130,6 @@ static int
 _avdInfo_getImagePaths(AvdInfo*  i, AvdInfoParams*  params )
 {
     int   wipeData    = (params->flags & AVDINFO_WIPE_DATA) != 0;
-    int   wipeCache   = (params->flags & AVDINFO_WIPE_CACHE) != 0;
-    int   noCache     = (params->flags & AVDINFO_NO_CACHE) != 0;
     int   noSdCard    = (params->flags & AVDINFO_NO_SDCARD) != 0;
     int   noSnapshots = (params->flags & AVDINFO_NO_SNAPSHOTS) != 0;
 
@@ -1186,24 +1184,6 @@ _avdInfo_getImagePaths(AvdInfo*  i, AvdInfoParams*  params )
         imageLoader_lock( l, 0 );
     }
 
-    /* the cache partition: unless the user doesn't want one,
-     * we're going to create it in the content directory
-     */
-    if (!noCache) {
-        imageLoader_set (l, AVD_IMAGE_CACHE);
-        imageLoader_load(l, IMAGE_OPTIONAL |
-                            IMAGE_EMPTY_IF_MISSING );
-
-        if (wipeCache) {
-            if (path_empty_file(l->pPath[0]) < 0) {
-                derror("cannot wipe %s image at %s: %s",
-                       l->imageText, l->pPath[0],
-                       strerror(errno));
-                exit(2);
-            }
-        }
-    }
-
     /* the SD Card image. unless the user doesn't want to, we're
      * going to mount it if available. Note that if the image is
      * already used, we must ignore it.
@@ -1314,7 +1294,6 @@ static int
 _avdInfo_getBuildImagePaths( AvdInfo*  i, AvdInfoParams*  params )
 {
     int   wipeData    = (params->flags & AVDINFO_WIPE_DATA) != 0;
-    int   noCache     = (params->flags & AVDINFO_NO_CACHE) != 0;
     int   noSdCard    = (params->flags & AVDINFO_NO_SDCARD) != 0;
     int   noSnapshots = (params->flags & AVDINFO_NO_SNAPSHOTS) != 0;
 
@@ -1386,18 +1365,6 @@ _avdInfo_getBuildImagePaths( AvdInfo*  i, AvdInfoParams*  params )
     /* force the system image to read-only status */
     l->pState[0] = IMAGE_STATE_READONLY;
 
-    /** cache partition handling
-     **/
-    if (!noCache) {
-        imageLoader_set (l, AVD_IMAGE_CACHE);
-
-        /* if the user provided one cache image, lock & use it */
-        if ( params->forcePaths[l->id] != NULL ) {
-            imageLoader_load(l, IMAGE_REQUIRED |
-                                IMAGE_IGNORE_IF_LOCKED);
-        }
-    }
-
     /** SD Card image
      **/
     if (!noSdCard) {
@@ -1547,6 +1514,18 @@ avdInfo_getRamdiskPath( AvdInfo* i )
     return _avdInfo_getContentOrSdkFilePath(i, imageName);
 }
 
+char*  avdInfo_getCachePath( AvdInfo*  i )
+{
+    const char* imageName = _imageFileNames[ AVD_IMAGE_CACHE ];
+    return _avdInfo_getContentFilePath(i, imageName);
+}
+
+char*  avdInfo_getDefaultCachePath( AvdInfo*  i )
+{
+    const char* imageName = _imageFileNames[ AVD_IMAGE_CACHE ];
+    return _getFullFilePath(i->contentPath, imageName);
+}
+
 char*
 avdInfo_getSystemInitImagePath( AvdInfo*  i )
 {
diff --git a/android/avd/info.h b/android/avd/info.h
index d00e9c6..9410653 100644
--- a/android/avd/info.h
+++ b/android/avd/info.h
@@ -137,6 +137,13 @@ const char*  avdInfo_getName( AvdInfo*  i );
 char*  avdInfo_getKernelPath( AvdInfo*  i );
 char*  avdInfo_getRamdiskPath( AvdInfo*  i );
 
+/* This function returns NULL if the cache image file cannot be found.
+ * Use avdInfo_getDefaultCachePath() to retrieve the default path
+ * if you intend to create the partition file there.
+ */
+char*  avdInfo_getCachePath( AvdInfo*  i );
+char*  avdInfo_getDefaultCachePath( AvdInfo*  i );
+
 char*  avdInfo_getSystemInitImagePath( AvdInfo*  i );
 char*  avdInfo_getDataInitImagePath( AvdInfo* i );