aboutsummaryrefslogtreecommitdiffstats
path: root/android/main.c
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@android.com>2011-03-01 06:14:59 -0800
committerAndroid Code Review <code-review@android.com>2011-03-01 06:14:59 -0800
commitf8a46731b2f86966399c9d24e095d669ba1a7898 (patch)
tree8522658803d023b6d64e066a41092956ff0cb4bc /android/main.c
parentab2b59e240f602a83d331ef04a78177c392ca91c (diff)
parente5af8a259e619973538f393011b1c26a3e2f4afb (diff)
downloadexternal_qemu-f8a46731b2f86966399c9d24e095d669ba1a7898.zip
external_qemu-f8a46731b2f86966399c9d24e095d669ba1a7898.tar.gz
external_qemu-f8a46731b2f86966399c9d24e095d669ba1a7898.tar.bz2
Merge "Remove CONFIG_ANDROID_SNAPSHOTS macro."
Diffstat (limited to 'android/main.c')
-rw-r--r--android/main.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/android/main.c b/android/main.c
index d906f8d..b99097f 100644
--- a/android/main.c
+++ b/android/main.c
@@ -490,7 +490,6 @@ int main(int argc, char **argv)
}
}
-#if CONFIG_ANDROID_SNAPSHOTS
if (!opts->no_snapstorage) {
// TODO: This should go to core
opts->snapstorage = (char*) avdInfo_getImageFile(avd, AVD_IMAGE_SNAPSHOTS);
@@ -532,7 +531,6 @@ int main(int argc, char **argv)
if (opts->snapshot_list) {
snapshot_print_and_exit(opts->snapstorage);
}
-#endif // CONFIG_ANDROID_SNAPSHOTS
if (!opts->logcat || opts->logcat[0] == 0) {
opts->logcat = getenv("ANDROID_LOG_TAGS");