diff --git a/tulip-chiphd/tulip_chiphd.mk b/tulip-chiphd/tulip_chiphd.mk index 120914c..7d6e7ee 100755 --- a/tulip-chiphd/tulip_chiphd.mk +++ b/tulip-chiphd/tulip_chiphd.mk @@ -4,7 +4,6 @@ $(call inherit-product, device/softwinner/tulip-common/tulip-common.mk) $(call inherit-product-if-exists, device/softwinner/tulip-chiphd/modules/modules.mk) $(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk) $(call inherit-product, hardware/realtek/bluetooth/firmware/rtlbtfw_cfg.mk) -$(call inherit-product, device/softwinner/tulip-chiphd/device.mk) DEVICE_PACKAGE_OVERLAYS := device/softwinner/tulip-chiphd/overlay \ $(DEVICE_PACKAGE_OVERLAYS) @@ -27,6 +26,7 @@ PRODUCT_PACKAGES += \ power.tulip PRODUCT_COPY_FILES += \ + device/softwinner/tulip-chiphd/kernel:kernel \ device/softwinner/tulip-chiphd/fstab.sun50iw1p1:root/fstab.sun50iw1p1 \ device/softwinner/tulip-chiphd/init.sun50iw1p1.rc:root/init.sun50iw1p1.rc \ device/softwinner/tulip-chiphd/init.recovery.sun50iw1p1.rc:root/init.recovery.sun50iw1p1.rc \ diff --git a/tulip-chiphd/tulip_chiphd_atv.mk b/tulip-chiphd/tulip_chiphd_atv.mk index c3cb464..0c398cd 100644 --- a/tulip-chiphd/tulip_chiphd_atv.mk +++ b/tulip-chiphd/tulip_chiphd_atv.mk @@ -4,15 +4,12 @@ $(call inherit-product, device/softwinner/tulip-common/tulip-common.mk) $(call inherit-product-if-exists, device/softwinner/tulip-chiphd/modules/modules.mk) $(call inherit-product, frameworks/native/build/tablet-7in-xhdpi-2048-dalvik-heap.mk) $(call inherit-product, hardware/realtek/bluetooth/firmware/rtlbtfw_cfg.mk) -$(call inherit-product, device/softwinner/tulip-chiphd/device.mk) DEVICE_PACKAGE_OVERLAYS := device/softwinner/tulip-chiphd/overlay \ $(DEVICE_PACKAGE_OVERLAYS) GAPPS_VARIANT := nano -$(call inherit-product, vendor/google/atv-build/atv-vendor.mk) - PRODUCT_PACKAGES += \ Provision \ SuperSU \ @@ -133,6 +130,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.app_widgets.xml:system/etc/permissions/android.software.app_widgets.xml $(call inherit-product-if-exists, vendor/google/products/gms_5.1r4_db.mk) +$(call inherit-product, vendor/google/atv-build/atv-vendor.mk) PRODUCT_BRAND := Allwinner PRODUCT_NAME := tulip_chiphd_atv