commit 8f8624e61f6ee111b141e91c8364ee00fac79059
author Jean-Baptiste Queru <jbq@google.com> Fri Jan 06 17:41:07 2012 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 06 17:41:07 2012 -0800
tree 104780f3141b2dd7a08c5ca91ce607bb7b82bbe5
parent 7353e43b850cd532c7d35969291757d5145eada2
parent 9caacbd74328624dfc753cecfc42cb29bf14bfad

am 9caacbd7: am 5ea72eff: Use the new location of the emulator kernel

* commit '9caacbd74328624dfc753cecfc42cb29bf14bfad':
  Use the new location of the emulator kernel

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index df413c1..afb69b2 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1305,7 +1305,7 @@
 
 INTERNAL_EMULATOR_PACKAGE_FILES += \
         $(HOST_OUT_EXECUTABLES)/emulator$(HOST_EXECUTABLE_SUFFIX) \
-        prebuilt/android-$(TARGET_ARCH)/kernel/kernel-qemu \
+        prebuilts/qemu-kernel/$(TARGET_ARCH)/kernel-qemu \
         $(INSTALLED_RAMDISK_TARGET) \
 		$(INSTALLED_SYSTEMIMAGE) \
 		$(INSTALLED_USERDATAIMAGE_TARGET)

target/board/vbox_x86/device.mk

diff --git a/target/board/vbox_x86/device.mk b/target/board/vbox_x86/device.mk
index 66a6e84..07ebb1c 100644
--- a/target/board/vbox_x86/device.mk
+++ b/target/board/vbox_x86/device.mk
@@ -24,7 +24,7 @@
     ro.ril.gprsclass=10 \
     ro.adb.qemud=1
 
-LOCAL_KERNEL := prebuilt/android-x86/kernel/kernel-vbox
+LOCAL_KERNEL := prebuilts/qemu-kernel/x86/kernel-vbox
 
 PRODUCT_COPY_FILES := \
     development/data/etc/apns-conf.xml:system/etc/apns-conf.xml \