diff options
| -rw-r--r-- | android/avd/hardware-properties.ini | 13 | ||||
| -rw-r--r-- | docs/ANDROID-KERNEL.TXT (renamed from docs/KERNEL.TXT) | 11 | ||||
| -rw-r--r-- | vl-android.c | 3 |
3 files changed, 20 insertions, 7 deletions
diff --git a/android/avd/hardware-properties.ini b/android/avd/hardware-properties.ini index 8fb51b4..a2b05df 100644 --- a/android/avd/hardware-properties.ini +++ b/android/avd/hardware-properties.ini @@ -14,10 +14,8 @@ # - once to implement the hardware configuration loader # (see android/avd/hw-config.h) # -# Hopefully, this file should also be read by a virtual device creation -# tool/wizard to provide a nice user interface (hence the presence of -# the 'abstract' and 'description' keys which are not currently used) -# +# It is also packaged by the SDK and parsed by tools to let the developers +# create AVDs. # # NOTE: if you remove items from this file, be sure that you do not break # the emulator build. @@ -55,6 +53,13 @@ default = yes abstract = Touch-screen support description = Whether there is a touch screen or not on the device. +# Hardware main keys (back/home) +name = hw.mainKeys +type = boolean +default = yes +abstract = Hardware Back/Home keys +description = Whether there are hardware back/home keys on the device. + # Trackball support name = hw.trackBall type = boolean diff --git a/docs/KERNEL.TXT b/docs/ANDROID-KERNEL.TXT index 35d1f1f..d5a1930 100644 --- a/docs/KERNEL.TXT +++ b/docs/ANDROID-KERNEL.TXT @@ -7,14 +7,19 @@ I. Helper script: We now provide a helper script to rebuild the kernel, it is under distrib/rebuild-kernel.sh. -You need the sources in android.git.kernel.org/kernel/common.git, -in branch origin/archive/android-gldfish-2.6.29 (note the typo!) +You need the sources in android.git.kernel.org/kernel/qemu.git, +in branch origin/android-goldfish-2.6.29 -To rebuild the ARM kernel: +To rebuild the ARMv5TE kernel: cd $KERNEL_SOURCES /path/to/rebuild-kernel.sh --out=$ANDROID/prebuilt/android-arm/kernel +To rebuild the ARMv7-A one: + + cd $KERNEL_SOURCES + /path/to/rebuild-kernel.sh --armv7 --out=$ANDROID/prebuilt/android-arm/kernel + To rebuild the x86 kernel: cd $KERNEL_SOURCES diff --git a/vl-android.c b/vl-android.c index a0041dc..322ddca 100644 --- a/vl-android.c +++ b/vl-android.c @@ -3689,6 +3689,9 @@ int main(int argc, char **argv, char **envp) hwLcd_setBootProperty(density); } + /* Initialize presence of hardware nav button */ + boot_property_add("qemu.hw.mainkeys", android_hw->hw_mainKeys ? "1" : "0"); + /* Initialize TCP dump */ if (android_op_tcpdump) { if (qemu_tcpdump_start(android_op_tcpdump) < 0) { |