Revise CF BoardConfig inherit from BoardConfigMainlineCommon.mk
Some settings in BoardConfig affect the output content in system.img.
This patch revises CF BoardConfig to align the setting in
BoardConfigMainlineCommon.mk. Which can fix the following system
difference between CF and GSI:
- output apex dexpreopt
- libbluetooth.so
- lmkd (TARGET_LMKD_STATS_LOG)
The patch tries to keep other setiings.
Bug: 140156429
Bug: 137709825
Bug: 137711200
Bug: 137713484
Test: compare the output files between with/without the patch
Change-Id: I3962b3e8dbd3f3e8148ca7db5072b2b1c31ac27a
diff --git a/shared/BoardConfig.mk b/shared/BoardConfig.mk
index 49d2c66..37a03c7 100644
--- a/shared/BoardConfig.mk
+++ b/shared/BoardConfig.mk
@@ -18,6 +18,15 @@
# Common BoardConfig for all supported architectures.
#
+include build/make/target/board/BoardConfigMainlineCommon.mk
+
+# Reset CF unsupported settings
+TARGET_NO_RECOVERY := false
+BOARD_USES_SYSTEM_OTHER_ODEX :=
+WITH_DEXPREOPT := true
+BOARD_AVB_ENABLE := false
+
+
TARGET_BOOTLOADER_BOARD_NAME := cutf
# Boot partition size: 32M
@@ -29,14 +38,12 @@
# Build a separate vendor.img partition
BOARD_USES_VENDORIMAGE := true
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
-TARGET_COPY_OUT_VENDOR := vendor
BOARD_USES_METADATA_PARTITION := true
# Build a separate product.img partition
BOARD_USES_PRODUCTIMAGE := true
BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4
-TARGET_COPY_OUT_PRODUCT := product
# Build a separate system_ext.img partition
BOARD_USES_SYSTEM_EXTIMAGE := true
@@ -48,9 +55,7 @@
endif
BOARD_USES_GENERIC_AUDIO := false
USE_CAMERA_STUB := true
-TARGET_USERIMAGES_USE_EXT4 := true
TARGET_USERIMAGES_SPARSE_EXT_DISABLED := true
-TARGET_USES_64_BIT_BINDER := true
# Hardware composer configuration
TARGET_USES_HWC2 := true
@@ -83,8 +88,6 @@
# TODO(san): See if we can get rid of this.
BOARD_FLASH_BLOCK_SIZE := 512
-WITH_DEXPREOPT := true
-
USE_OPENGL_RENDERER := true
# Wifi.
@@ -141,12 +144,6 @@
DHCPCD_USE_DBUS := no
DHCPCD_USE_SCRIPT := yes
-USE_XML_AUDIO_POLICY_CONF := 1
-
-BOARD_VNDK_VERSION := current
-
-# TODO(b/73078796): remove
-BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
TARGET_RECOVERY_PIXEL_FORMAT := ABGR_8888
ifeq ($(TARGET_BUILD_SYSTEM_ROOT_IMAGE),true)
@@ -180,6 +177,3 @@
# To see full logs from init, disable ratelimiting.
# The default is 5 messages per second amortized, with a burst of up to 10.
BOARD_KERNEL_CMDLINE += printk.devkmsg=on
-
-# Include stats logging code in LMKD
-TARGET_LMKD_STATS_LOG := true
