diff options
| author | Vladimir Chtchetkine <vchtchetkine@google.com> | 2010-07-22 11:23:19 -0700 |
|---|---|---|
| committer | Vladimir Chtchetkine <vchtchetkine@google.com> | 2010-07-22 11:23:19 -0700 |
| commit | 43552dc4fa64aad0c9fdb8f4c92ae7ac79406596 (patch) | |
| tree | b1263d1a7fc5cf44f4f05334d73927dd91148609 /vl-android.c | |
| parent | 2fa5173bd1ce7341c50adac676a317945f0969c7 (diff) | |
| download | external_qemu-43552dc4fa64aad0c9fdb8f4c92ae7ac79406596.zip external_qemu-43552dc4fa64aad0c9fdb8f4c92ae7ac79406596.tar.gz external_qemu-43552dc4fa64aad0c9fdb8f4c92ae7ac79406596.tar.bz2 | |
Remove UI dependency from goldfish_event_device.c
Change-Id: Iea5edfbae0caff45161c814d631d35d2e6d61d1c
Diffstat (limited to 'vl-android.c')
| -rw-r--r-- | vl-android.c | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/vl-android.c b/vl-android.c index 1673426..ea40275 100644 --- a/vl-android.c +++ b/vl-android.c @@ -186,7 +186,7 @@ unsigned long android_verbose; #endif // CONFIG_STANDALONE_CORE -#ifdef CONFIG_SKINS +#if defined(CONFIG_SKINS) && !defined(CONFIG_STANDALONE_CORE) #undef main #define main qemu_main #endif @@ -334,6 +334,8 @@ extern char* android_op_ports; extern char* android_op_port; extern char* android_op_report_console; extern char* op_http_proxy; +// Path to the file containing specific key character map. +char* op_charmap_file = NULL; extern void dprint( const char* format, ... ); @@ -5740,10 +5742,27 @@ int main(int argc, char **argv, char **envp) case QEMU_OPTION_http_proxy: op_http_proxy = (char*)optarg; break; + + case QEMU_OPTION_charmap: + op_charmap_file = (char*)optarg; + break; } } } + /* Initialize character map. */ + if (android_charmap_setup(op_charmap_file)) { + if (op_charmap_file) { + fprintf(stderr, + "Unable to initialize character map from file %s.\n", + op_charmap_file); + } else { + fprintf(stderr, + "Unable to initialize default character map.\n"); + } + exit(1); + } + /* If no data_dir is specified then try to find it relative to the executable path. */ if (!data_dir) { |