summaryrefslogtreecommitdiffstats
path: root/core/Makefile
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2012-01-06 17:41:07 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-01-06 17:41:07 -0800
commit8f8624e61f6ee111b141e91c8364ee00fac79059 (patch)
tree104780f3141b2dd7a08c5ca91ce607bb7b82bbe5 /core/Makefile
parent7353e43b850cd532c7d35969291757d5145eada2 (diff)
parent9caacbd74328624dfc753cecfc42cb29bf14bfad (diff)
downloadbuild-8f8624e61f6ee111b141e91c8364ee00fac79059.zip
build-8f8624e61f6ee111b141e91c8364ee00fac79059.tar.gz
build-8f8624e61f6ee111b141e91c8364ee00fac79059.tar.bz2
am 9caacbd7: am 5ea72eff: Use the new location of the emulator kernel
* commit '9caacbd74328624dfc753cecfc42cb29bf14bfad': Use the new location of the emulator kernel
Diffstat (limited to 'core/Makefile')
-rw-r--r--core/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile
index df413c1..afb69b2 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1305,7 +1305,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)