diff options
| author | Xavier Ducrohet <xav@android.com> | 2011-08-11 18:47:27 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2011-08-22 11:10:50 -0700 |
| commit | 72d561178e62b74923cfe3bc0faa59bcb07c57c3 (patch) | |
| tree | 73281ee53a1af78289200a49b9ce9d180c9c59ad /android/main-common.c | |
| parent | 34ddd725dd424c4ad487d223feb0f38f13b10779 (diff) | |
| download | external_qemu-72d561178e62b74923cfe3bc0faa59bcb07c57c3.zip external_qemu-72d561178e62b74923cfe3bc0faa59bcb07c57c3.tar.gz external_qemu-72d561178e62b74923cfe3bc0faa59bcb07c57c3.tar.bz2 | |
Revert "Revert "Merge c80340 from master to r13: Move charmap to hardware properties"..."
This reverts commit cccd28ca5064a7bd14282cd774ee5bb7126d5845.
c80340 add a CL to tools_r13 that broken the build. It was therefore reverted
with cccd28. This revert was merged into tools_r13 but shouldn't have been.
This reverts the revert to put back the CL in master.
Change-Id: I95fcefedb77596cfdf76269f248b2ae80c85c830
Diffstat (limited to 'android/main-common.c')
| -rw-r--r-- | android/main-common.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/android/main-common.c b/android/main-common.c index a0e5f56..a662907 100644 --- a/android/main-common.c +++ b/android/main-common.c @@ -335,9 +335,6 @@ static const struct { { NULL, NULL } }; -/* this is used by hw/events_device.c to send the charmap name to the system */ -const char* android_skin_keycharmap = NULL; - void parse_skin_files(const char* skinDirPath, const char* skinName, @@ -563,8 +560,6 @@ init_sdl_ui(AConfig* skinConfig, exit(1); } - android_skin_keycharmap = skin_keyboard_charmap_name(qemulator_get()->keyboard); - /* add an onion overlay image if needed */ if (opts->onion) { SkinImage* onion = skin_image_find_simple( opts->onion ); |