From bdb6f2dd35a4c749186e665d55d7b76375d7e71d Mon Sep 17 00:00:00 2001 From: David 'Digit' Turner Date: Wed, 23 Feb 2011 15:57:25 +0100 Subject: Remove android/main-ui.c The differences between android/main.c and android/main-ui.c are now minimal, so remove the latter source file by moving the corresponding code into android/main-common.c Also add a -snapshot-no-time-update core option to implement the emulator-ui -no-snapshot-update-time option. We're probably going to clean this up a little in the future, but this is enough for now. Change-Id: I868bb4e47c3d106ae7436ee3f5b2c0ff5fb6ea5c --- android/main-common.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'android/main-common.h') diff --git a/android/main-common.h b/android/main-common.h index 102d4e4..c26b9b9 100644 --- a/android/main-common.h +++ b/android/main-common.h @@ -78,4 +78,14 @@ struct AvdInfo* createAVD(AndroidOptions* opts, int* inAndroidBuild); void updateHwConfigFromAVD(AndroidHwConfig* hwConfig, struct AvdInfo* avd, AndroidOptions* opts, int inAndroidBuild); +/* Called from android/main.c to handle options specific to the standalone + * UI program. This is a no-op otherwise. + */ +void handle_ui_options( AndroidOptions* opts ); + +/* Called from android/main.c to potentially attach to a core from the + * standalone UI program. This is a no-op otherwise. + */ +int attach_ui_to_core( AndroidOptions* opts ); + #endif /* ANDROID_MAIN_COMMON_H */ -- cgit v1.1