diff options
| author | David 'Digit' Turner <digit@android.com> | 2011-02-23 13:32:37 +0100 |
|---|---|---|
| committer | David 'Digit' Turner <digit@android.com> | 2011-02-23 17:05:34 +0100 |
| commit | 462564f31bbdc9939bf1d2376e2782defa7ef655 (patch) | |
| tree | 261958f81739fbfcf4228c05fdbcc6f854008286 /android/main.c | |
| parent | fa59e01ddace99351b212b8d82700156776e27e6 (diff) | |
| download | external_qemu-462564f31bbdc9939bf1d2376e2782defa7ef655.zip external_qemu-462564f31bbdc9939bf1d2376e2782defa7ef655.tar.gz external_qemu-462564f31bbdc9939bf1d2376e2782defa7ef655.tar.bz2 | |
Minor cleanups for core/ui Makefile separation.
This patch contains minor cleanups that will be needed by
a few future patches that will improve the way core and ui
sources are separated and built.
- remove a few compiler warnings
- formatting
- remove the memcheck CONFIG_MEMCHECK checks (they later get in the way)
- refine hw/hw.h inclusion's of cpu.h (this comes from upstream)
- add missing definitions for PRUd64 and PRUx64 (used later)
- remove CONFIG_SHAPER test, replace with CONFIG_ANDROID instead.
- add missing strdup() calls.
Change-Id: Ic7d6681a51af718c298f0ee4bd884b1d8750f28e
Diffstat (limited to 'android/main.c')
| -rw-r--r-- | android/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/main.c b/android/main.c index b2c2c80..40f4b9b 100644 --- a/android/main.c +++ b/android/main.c @@ -233,7 +233,7 @@ int main(int argc, char **argv) opts->no_skin = opts->noskin; /* Parses options and builds an appropriate AVD. */ - avd = android_avdInfo = createAVD(opts, &inAndroidBuild) ; + avd = android_avdInfo = createAVD(opts, &inAndroidBuild); /* get the skin from the virtual device configuration */ opts->skin = (char*) avdInfo_getSkinName( avd ); @@ -810,7 +810,7 @@ int main(int argc, char **argv) #endif args[n++] = "-android-avdname"; - args[n++] = avdInfo_getName(avd); + args[n++] = (char*) avdInfo_getName(avd); /* Set up the interfaces for inter-emulator networking */ if (opts->shared_net_id) { |