diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-08-20 07:54:29 -0700 |
|---|---|---|
| committer | Jean-Baptiste Queru <jbq@google.com> | 2010-08-20 07:54:29 -0700 |
| commit | 6d3f7bd0859962df26566db462eb4b42477b89d4 (patch) | |
| tree | bcccadf79dfbfd225690e698b1326d890e8e67b5 | |
| parent | 0a68a36b6efc2aac80a6717810530961465e77be (diff) | |
| download | dream-sapphire-6d3f7bd0859962df26566db462eb4b42477b89d4.tar.gz | |
Switch to more modern way to handle the kernel.
Copied from passion.
Change-Id: I81510268899f9f95dbacfa3eb157724794a1824c
| -rw-r--r-- | AndroidBoardCommon.mk | 11 | ||||
| -rw-r--r-- | device_dream_sapphire.mk | 10 |
2 files changed, 12 insertions, 9 deletions
diff --git a/AndroidBoardCommon.mk b/AndroidBoardCommon.mk index 86daf0f..9a7afc3 100644 --- a/AndroidBoardCommon.mk +++ b/AndroidBoardCommon.mk @@ -14,15 +14,6 @@ LOCAL_PATH := $(call my-dir) -ifeq ($(TARGET_PREBUILT_KERNEL),) -TARGET_PREBUILT_KERNEL := $(LOCAL_PATH)/kernel -endif - -file := $(INSTALLED_KERNEL_TARGET) -ALL_PREBUILT += $(file) -$(file): $(TARGET_PREBUILT_KERNEL) | $(ACP) - $(transform-prebuilt-to-target) - $(call add-radio-file,recovery/images/firmware_error.565) $(call add-radio-file,recovery/images/bitmap_size.txt) @@ -45,4 +36,6 @@ LOCAL_MODULE_PATH := $(TARGET_OUT)/lib/modules LOCAL_SRC_FILES := $(LOCAL_MODULE) include $(BUILD_PREBUILT) +ALL_PREBUILT += $(INSTALLED_KERNEL_TARGET) + -include vendor/htc/dream-sapphire/AndroidBoardCommonVendor.mk diff --git a/device_dream_sapphire.mk b/device_dream_sapphire.mk index 7f25bf6..bbf4015 100644 --- a/device_dream_sapphire.mk +++ b/device_dream_sapphire.mk @@ -52,5 +52,15 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_COPY_FILES += \ device/htc/dream-sapphire/media_profiles.xml:/system/etc/media_profiles.xml +# The kernel +ifeq ($(TARGET_PREBUILT_KERNEL),) +LOCAL_KERNEL := device/htc/dream-sapphire/kernel +else +LOCAL_KERNEL := $(TARGET_PREBUILT_KERNEL) +endif + +PRODUCT_COPY_FILES += \ + $(LOCAL_KERNEL):kernel + # proprietary side of the device $(call inherit-product-if-exists, vendor/htc/dream-sapphire/device_dream_sapphire-vendor.mk) |