diff options
Diffstat (limited to 'android/main.c')
| -rw-r--r-- | android/main.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/android/main.c b/android/main.c index 919810b..15adaf4 100644 --- a/android/main.c +++ b/android/main.c @@ -26,8 +26,11 @@ #include "console.h" #include "user-events.h" +#ifndef CONFIG_STANDALONE_CORE #include <SDL.h> #include <SDL_syswm.h> +#include "android/qemulator.h" +#endif #include "math.h" @@ -48,7 +51,6 @@ #include "android/globals.h" -#include "android/qemulator.h" #include "android/display.h" #include "android/snapshot.h" @@ -260,7 +262,7 @@ _adjustPartitionSize( const char* description, if (imageMB > defaultMB) { snprintf(temp, sizeof temp, "(%d MB > %d MB)", imageMB, defaultMB); } else { - snprintf(temp, sizeof temp, "(%lld bytes > %lld bytes)", imageBytes, defaultBytes); + snprintf(temp, sizeof temp, "(%" PRUd64" bytes > %" PRUd64" bytes)", imageBytes, defaultBytes); } if (inAndroidBuild) { @@ -603,6 +605,7 @@ int main(int argc, char **argv) android_avdInfo = avdInfo_newForAndroidBuild( android_build_root, android_build_out, + TARGET_ARCH, android_avdParams ); if(android_avdInfo == NULL) { @@ -631,6 +634,7 @@ int main(int argc, char **argv) exit(1); } +#ifndef CONFIG_STANDALONE_CORE if (opts->keyset) { parse_keyset(opts->keyset, opts); if (!android_keyset) { @@ -653,6 +657,7 @@ int main(int argc, char **argv) write_default_keyset(); } } +#endif /* !CONFIG_STANDALONE_CORE */ if (opts->shared_net_id) { char* end; @@ -1090,7 +1095,7 @@ int main(int argc, char **argv) } /* Pass LCD density value to the core. */ - snprintf(lcd_density, sizeof(lcd_density), "%d", get_device_dpi(opts)); + snprintf(lcd_density, sizeof(lcd_density), "%d", hw->hw_lcd_density); args[n++] = "-lcd-density"; args[n++] = lcd_density; |