MiPad4/android_device_xiaomi_sdm660-common
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sdm660-common: move A/B stuff to common

Browse source 
Change-Id: I8770ea03a27f96e04daedaf021906842c0bcebce
This commit is contained in:
Stylogey 2020-05-03 18:14:16 +02:00 committed by OdSazib
parent 60d1a018b4
commit c3ac2b42e2
No known key found for this signature in database
GPG key ID: CB336514F9F5CF69
3 changed files with 51 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
BoardConfigCommon.mk
View file

@ -25,6 +25,18 @@
# Common Tree Path # Common Tree Path
COMMON_PATH := device/xiaomi/sdm660-common COMMON_PATH := device/xiaomi/sdm660-common
# A/B
ifeq ($(ENABLE_AB), true)
AB_OTA_UPDATER := true
AB_OTA_PARTITIONS ?= \
boot \
system \
vendor
BOARD_BUILD_SYSTEM_ROOT_IMAGE := true
BOARD_USES_RECOVERY_AS_BOOT := true
TARGET_NO_RECOVERY := true
endif
# ANT+ # ANT+
BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl" BOARD_ANT_WIRELESS_DEVICE := "qualcomm-hidl"
@ -163,7 +175,7 @@ BOARD_USES_METADATA_PARTITION := true
# Partitions # Partitions
BOARD_FLASH_BLOCK_SIZE := 262144 BOARD_FLASH_BLOCK_SIZE := 262144
BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
ifneq ($(AB_OTA_UPDATER), true) ifneq ($(ENABLE_AB), true)
BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4 BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE := ext4
BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456 BOARD_CACHEIMAGE_PARTITION_SIZE := 268435456
BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864 BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864
@ -202,7 +214,7 @@ TARGET_USES_QCOM_BSP := false
# Recovery # Recovery
ifneq ($(filter lavender,$(TARGET_DEVICE)),) ifneq ($(filter lavender,$(TARGET_DEVICE)),)
TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab_A.qcom TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab_A.qcom
else ifeq ($(AB_OTA_UPDATER), true) else ifeq ($(ENABLE_AB), true)
TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab_AB.qcom TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab_AB.qcom
else else
TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/rootdir/etc/fstab.qcom

2
rootdir/Android.mk
View file

@ -97,7 +97,7 @@ LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_CLASS := ETC
ifneq ($(filter lavender,$(TARGET_DEVICE)),) ifneq ($(filter lavender,$(TARGET_DEVICE)),)
LOCAL_SRC_FILES := etc/fstab_A.qcom LOCAL_SRC_FILES := etc/fstab_A.qcom
else ifeq ($(AB_OTA_UPDATER), true) else ifeq ($(ENABLE_AB), true)
LOCAL_SRC_FILES := etc/fstab_AB.qcom LOCAL_SRC_FILES := etc/fstab_AB.qcom
else else
LOCAL_SRC_FILES := etc/fstab.qcom LOCAL_SRC_FILES := etc/fstab.qcom

36
sdm660.mk
View file

@ -40,6 +40,42 @@ COMMON_PATH := device/xiaomi/sdm660-common
# Inherit properties # Inherit properties
$(call inherit-product, $(COMMON_PATH)/common_prop.mk) $(call inherit-product, $(COMMON_PATH)/common_prop.mk)
# A/B
ifeq ($(ENABLE_AB), true)
AB_OTA_POSTINSTALL_CONFIG += \
RUN_POSTINSTALL_system=true \
POSTINSTALL_PATH_system=system/bin/otapreopt_script \
FILESYSTEM_TYPE_system=ext4 \
POSTINSTALL_OPTIONAL_system=true
PRODUCT_PACKAGES += \
otapreopt_script
# Boot control
PRODUCT_PACKAGES += \
android.hardware.boot@1.0-impl \
android.hardware.boot@1.0-impl.recovery \
android.hardware.boot@1.0-service \
bootctrl.sdm660 \
bootctrl.sdm660.recovery
# Boot control debug
PRODUCT_PACKAGES_DEBUG += \
bootctl
# Update engine
PRODUCT_PACKAGES += \
update_engine \
update_engine_sideload \
update_verifier
PRODUCT_HOST_PACKAGES += \
brillo_update_payload
PRODUCT_PACKAGES_DEBUG += \
update_engine_client
endif
# Audio # Audio
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
android.hardware.audio@5.0-impl \ android.hardware.audio@5.0-impl \