aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.android
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2009-09-19 00:07:43 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2009-09-19 00:07:43 -0700
commit6f0e6da580dcc786104edefef3a879f018834a3a (patch)
treeeafe0afe1079a9a656a6d604c05faaeee2caceb0 /Makefile.android
parent48f2fd223f6ae5d7239273b45dd6012ab68f927a (diff)
parent060749410208cd5a0e25faacdd6a5ef1ae8cf6d5 (diff)
downloadexternal_qemu-6f0e6da580dcc786104edefef3a879f018834a3a.zip
external_qemu-6f0e6da580dcc786104edefef3a879f018834a3a.tar.gz
external_qemu-6f0e6da580dcc786104edefef3a879f018834a3a.tar.bz2
am 06074941: Merge change 25638 into eclair
Merge commit '060749410208cd5a0e25faacdd6a5ef1ae8cf6d5' into eclair-plus-aosp * commit '060749410208cd5a0e25faacdd6a5ef1ae8cf6d5': Allow skins to provide a "dpad-rotation" field for each layout.
Diffstat (limited to 'Makefile.android')
-rw-r--r--Makefile.android1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.android b/Makefile.android
index 8e92ca5..dde93b3 100644
--- a/Makefile.android
+++ b/Makefile.android
@@ -499,6 +499,7 @@ VL_SOURCES := vl-android.c osdep.c cutils.c \
android/hw-lcd.c \
android/hw-qemud.c \
android/hw-sensors.c \
+ android/keycode.c \
android/main.c \
android/resource.c \
android/user-config.c \