diff options
Diffstat (limited to 'hikey960/device-hikey960.mk')
| -rw-r--r-- | hikey960/device-hikey960.mk | 67 |
1 files changed, 24 insertions, 43 deletions
diff --git a/hikey960/device-hikey960.mk b/hikey960/device-hikey960.mk index 9bde93b8..fba39a48 100644 --- a/hikey960/device-hikey960.mk +++ b/hikey960/device-hikey960.mk @@ -14,33 +14,33 @@ # limitations under the License. # +# Enable Virtual A/B +AB_OTA_UPDATER := true +AB_OTA_PARTITIONS += \ + product \ + system \ + system_ext \ + vendor + +$(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota.mk) + PRODUCT_COPY_FILES += $(TARGET_PREBUILT_KERNEL):kernel \ $(TARGET_PREBUILT_DTB):hi3660-hikey960.dtb PRODUCT_COPY_FILES += $(LOCAL_PATH)/fstab.hikey960:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.hikey960 \ - device/linaro/hikey/fstab.ramdisk:$(TARGET_COPY_OUT_RAMDISK)/fstab.hikey960 \ + $(LOCAL_PATH)/fstab.hikey960:$(TARGET_COPY_OUT_RAMDISK)/fstab.hikey960 \ device/linaro/hikey/hikey960/init.hikey960.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.rc \ device/linaro/hikey/init.hikey960.power.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.power.rc \ - device/linaro/hikey/init.common.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.usb.rc \ + device/linaro/hikey/hikey960/init.hikey960.usb.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.hikey960.usb.rc \ device/linaro/hikey/ueventd.common.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc \ device/linaro/hikey/common.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/hikey960.kl \ frameworks/native/data/etc/android.hardware.vulkan.level-1.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.level.xml \ - frameworks/native/data/etc/android.hardware.vulkan.version-1_0_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml - -# Copy BT firmware -PRODUCT_COPY_FILES += \ - device/linaro/hikey/bt-wifi-firmware-util/TIInit_11.8.32-pcm-960.bts:$(TARGET_COPY_OUT_VENDOR)/firmware/ti-connectivity/TIInit_11.8.32.bts - -# Copy wlan firmware -PRODUCT_COPY_FILES += \ - device/linaro/hikey/bt-wifi-firmware-util/wl18xx-fw-4.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/ti-connectivity/wl18xx-fw-4.bin \ - device/linaro/hikey/bt-wifi-firmware-util/wl18xx-conf-wl1837mod.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/ti-connectivity/wl18xx-conf.bin - -# Copy hifi firmware -PRODUCT_COPY_FILES += \ - device/linaro/hikey/hifi/firmware/hifi-hikey960.img:$(TARGET_COPY_OUT_VENDOR)/firmware/hifi/hifi.img \ - device/linaro/hikey/hifi/xaf/host-apf/tools/dhifimesg:/vendor/bin/dhifimesg + frameworks/native/data/etc/android.hardware.vulkan.version-1_0_3.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.vulkan.version.xml \ + frameworks/native/data/etc/android.software.vulkan.deqp.level-2020-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml +PRODUCT_BUILD_SUPER_PARTITION := true +PRODUCT_USE_DYNAMIC_PARTITIONS := true +PRODUCT_USE_DYNAMIC_PARTITION_SIZE :=true # Build HiKey960 HDMI audio HAL. Experimental only may not work. FIXME PRODUCT_PACKAGES += audio.primary.hikey960 @@ -48,14 +48,13 @@ PRODUCT_PACKAGES += audio.primary.hikey960 PRODUCT_PACKAGES += gralloc.hikey960 #binary blobs from ARM -PRODUCT_PACKAGES += libGLES_mali.so \ - vulkan.hikey960.so \ - libbccArm.so \ - libRSDriverArm.so \ - libmalicore.bc \ - END_USER_LICENCE_AGREEMENT.txt +PRODUCT_PACKAGES += libGLES_mali \ + vulkan.hikey960 \ + libbccArm \ + libRSDriverArm \ + libmalicore.bc -ifdef $(MALI_RS_DRIVER_AVAILABLE) +ifdef MALI_RS_DRIVER_AVAILABLE PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/../mali/bifrost/lib/libclcore.bc:vendor/lib/libclcore.bc \ $(LOCAL_PATH)/../mali/bifrost/lib/libclcore_neon.bc:vendor/lib/libclcore_neon.bc \ @@ -75,25 +74,7 @@ PRODUCT_DEFAULT_PROPERTY_OVERRIDES += sys.usb.controller=ff100000.dwc3 PRODUCT_PACKAGES += sensors.hikey960 -ifeq ($(HIKEY_USE_DRM_HWCOMPOSER), true) - PRODUCT_PACKAGES += hwcomposer.drm_hikey960 -endif - -# Unfortunately inherit-product doesn't export build variables from the -# called make file to the caller, so we have to include it directly here. -# FIXME: Improve this the next time we update the binary package -ifneq (,$(wildcard vendor/linaro/hikey960/hisilicon/device-partial.mk)) -include vendor/linaro/hikey960/hisilicon/device-partial.mk -endif - -EXPECTED_HISI_CODEC_VERSION := 1 -# Check and make sure the vendor package is the expected version -ifneq ($(TARGET_HISI_CODEC_VERSION),$(EXPECTED_HISI_CODEC_VERSION)) -$(warning TARGET_HISI_CODEC_VERSION ($(TARGET_HISI_CODEC_VERSION)) does not match exiting the build ($(EXPECTED_HISI_CODEC_VERSION)).) -$(warning Please download new binaries here:) -$(warning https://dl.google.com/dl/android/aosp/hisilicon-hikey960-OPR-3c243263.tgz ) -$(warning And extract in the ANDROID_TOP_DIR) -endif +PRODUCT_PACKAGES += hwcomposer.drm_hikey960 ifneq ($(TARGET_NO_RECOVERY),true) PRODUCT_COPY_FILES += \ |