zenfone6: device cleanup
Change-Id: Ic499184bd78a678fad971a79feac1ff2c58bf9dc
diff --git a/BoardConfig.mk b/BoardConfig.mk
index ce603ec..05d19a4 100755
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -47,7 +47,7 @@
TARGET_NO_BOOTLOADER := true
# A/B
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag
+BOARD_AVB_ENABLE := true
BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2
# ANT+
@@ -110,14 +110,12 @@
BOARD_TAGS_OFFSET := 0x00000100
TARGET_KERNEL_ARCH := arm64
TARGET_KERNEL_HEADER_ARCH := arm64
-#TARGET_KERNEL_CROSS_COMPILE_PREFIX := aarch64-linux-android-
BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
TARGET_COMPILE_WITH_MSM_KERNEL := true
TARGET_KERNEL_SOURCE := kernel/asus/sm8150
TARGET_KERNEL_CONFIG := vendor/zs630kl_defconfig
BOARD_KERNEL_SEPARATED_DTBO := true
TARGET_KERNEL_CLANG_COMPILE := true
-TARGET_KERNEL_CLANG_VERSION := 7.0.2
# Modules
NEED_KERNEL_MODULE_SYSTEM := true
@@ -129,8 +127,6 @@
TARGET_OTA_ASSERT_DEVICE := WW_I01WD
# Partitions
-BOARD_AVB_ENABLE := true
-BOARD_AVB_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296
BOARD_DTBOIMG_PARTITION_SIZE := 8388608
diff --git a/device.mk b/device.mk
index efa65fe..12d8b15 100755
--- a/device.mk
+++ b/device.mk
@@ -25,11 +25,6 @@
# Enable updating of APEXes
$(call inherit-product, $(SRC_TARGET_DIR)/product/updatable_apex.mk)
-#from build treble includes
-PRODUCT_COPY_FILES += \
- system/core/rootdir/init.zygote64_32.rc:root/init.zygote64_32.rc \
- system/core/rootdir/init.zygote32_64.rc:root/init.zygote32_64.rc
-
# Overlays
DEVICE_PACKAGE_OVERLAYS += \
$(LOCAL_PATH)/overlay
@@ -57,9 +52,6 @@
PRODUCT_SHIPPING_API_LEVEL := 28
# audio
-PRODUCT_PACKAGES += \
- audio.a2dp.default
-
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/audio/audio_policy_configuration.xml:system/etc/audio_policy_configuration.xml \
$(LOCAL_PATH)/audio/audio_policy_volumes_ZS630KL.xml:system/etc/audio_policy_volumes_ZS630KL.xml
@@ -95,9 +87,6 @@
PRODUCT_PACKAGES += \
libtinyalsa
-PRODUCT_PACKAGES += \
- ld.config.txt
-
# Exclude vibrator from InputManager
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/excluded-input-devices.xml:system/etc/excluded-input-devices.xml
@@ -145,7 +134,7 @@
$(call find-copy-subdir-files,*,device/asus/zenfone6/prebuilt/system,system) \
$(call find-copy-subdir-files,*,device/asus/zenfone6/prebuilt/root,root)
-PRODUCT_AAPT_CONFIG := xxhdpi
+PRODUCT_AAPT_CONFIG := normal
PRODUCT_AAPT_PREF_CONFIG := xxhdpi
# Properties
@@ -169,10 +158,6 @@
PRODUCT_SOONG_NAMESPACES += \
$(LOCAL_PATH)
-# SP-NDK:
-PRODUCT_PACKAGES += \
- libvulkan
-
# Telephony
PRODUCT_PACKAGES += \
ims-ext-common \