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

* commit '5ea72effbd944891708d2d6fb61055830e617701':
  Use the new location of the emulator kernel
This commit is contained in:
Jean-Baptiste Queru 2012-01-06 17:37:02 -08:00 committed by Android Git Automerger
commit 9caacbd743
2 changed files with 2 additions and 2 deletions

View File

@ -1298,7 +1298,7 @@ dalvikfiles: $(INTERNAL_DALVIK_MODULES)
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)

View File

@ -23,7 +23,7 @@ PRODUCT_PROPERTY_OVERRIDES := \
ro.ril.hsxpa=1 \
ro.ril.gprsclass=10
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 \