begonia: Inherit from common tree

Signed-off-by: Aayush Gupta <[email protected]>

Android.mk

@@ -17,29 +17,5 @@
 LOCAL_PATH := $(call my-dir)
 
 ifeq ($(TARGET_DEVICE),begonia)
-  subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
-  $(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))
-
-include $(CLEAR_VARS)
-
-GATEKEEPER_SYMLINKS := $(TARGET_OUT_VENDOR)
-$(GATEKEEPER_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating gatekeeper symlinks: $@"
-	@mkdir -p $@/lib/hw
-	@mkdir -p $@/lib64/hw
-	@ln -sf libSoftGatekeeper.so $@/lib/hw/gatekeeper.default.so
-	@ln -sf libSoftGatekeeper.so $@/lib64/hw/gatekeeper.default.so
-
-ALL_DEFAULT_INSTALLED_MODULES += $(GATEKEEPER_SYMLINKS)
-
-VULKAN_SYMLINKS := $(TARGET_OUT_VENDOR)
-$(VULKAN_SYMLINKS): $(LOCAL_INSTALLED_MODULE)
-	@echo "Creating vulkan symlinks: $@"
-	@mkdir -p $@/lib/hw/
-	@mkdir -p $@/lib64/hw/
-	@ln -sf $@/lib/egl/libGLES_VULKAN.so $@/lib/hw/vulkan.mt6785.so
-	@ln -sf $@/lib64/egl/libGLES_VULKAN.so $@/lib64/hw/vulkan.mt6785.so
-
-ALL_DEFAULT_INSTALLED_MODULES += $(VULKAN_SYMLINKS)
-
+include $(call all-makefiles-under,$(LOCAL_PATH))
 endif

BoardConfig.mk

@@ -17,138 +17,12 @@
 
 DEVICE_PATH := device/xiaomi/begonia
 
-BUILD_BROKEN_DUP_RULES := true
-BUILD_BROKEN_PHONY_TARGETS := true
+# Inherit from common tree
+-include device/xiaomi/mt6785-common/BoardConfigCommon.mk
 
-# Architecture
-TARGET_ARCH := arm64
-TARGET_ARCH_VARIANT := armv8-a
-TARGET_CPU_ABI := arm64-v8a
-TARGET_CPU_ABI2 :=
-TARGET_CPU_VARIANT := generic
-TARGET_CPU_VARIANT_RUNTIME := cortex-a76
-
-TARGET_2ND_ARCH := arm
-TARGET_2ND_ARCH_VARIANT := armv8-a
-TARGET_2ND_CPU_ABI := armeabi-v7a
-TARGET_2ND_CPU_ABI2 := armeabi
-TARGET_2ND_CPU_VARIANT := generic
-TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a76
-
-# APEX
-DEXPREOPT_GENERATE_APEX_IMAGE := true
-
-# Audio
-AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true
-AUDIO_FEATURE_ENABLED_EXTN_FORMATS := true
-AUDIO_FEATURE_ENABLED_HDMI_SPK := true
-AUDIO_FEATURE_ENABLED_PROXY_DEVICE := true
-USE_CUSTOM_AUDIO_POLICY := 1
-USE_XML_AUDIO_POLICY_CONF := 1
-
-# Charger
-BOARD_CHARGER_ENABLE_SUSPEND := true
-
-# Display
-TARGET_SCREEN_DENSITY := 440
-
-# Bootloader
-TARGET_BOOTLOADER_BOARD_NAME := begonia
-TARGET_NO_BOOTLOADER := true
-
-# Platform
-TARGET_BOARD_PLATFORM := mt6785
-TARGET_BOARD_PLATFORM_GPU := mali-g76mc4
-
-# Kernel
-BOARD_KERNEL_CMDLINE := bootopt=64S3,32N2,64N2
-BOARD_KERNEL_BASE := 0x40078000
-BOARD_KERNEL_OFFSET := 0x00008000
-BOARD_KERNEL_PAGESIZE := 2048
-BOARD_KERNEL_TAGS_OFFSET := 0x0bc08000
-BOARD_RAMDISK_OFFSET     := 0x07c08000
-BOARD_KERNEL_IMAGE_NAME := Image.gz-dtb
-BOARD_KERNEL_SEPARATED_DTBO := true
-BOARD_BOOTIMG_HEADER_VERSION := 1
-
-TARGET_KERNEL_ARCH := arm64
-TARGET_KERNEL_HEADER_ARCH := arm64
-TARGET_KERNEL_SOURCE := kernel/xiaomi/mt6785
-TARGET_KERNEL_CONFIG := begonia_user_defconfig
-TARGET_KERNEL_CLANG_COMPILE := true
-TARGET_KERNEL_CLANG_VERSION := r353983d
-
-BOARD_MKBOOTIMG_ARGS := --ramdisk_offset $(BOARD_RAMDISK_OFFSET)
-BOARD_MKBOOTIMG_ARGS += --tags_offset $(BOARD_KERNEL_TAGS_OFFSET)
-BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOTIMG_HEADER_VERSION)
-
-BOARD_CUSTOM_DTBOIMG_MK := $(DEVICE_PATH)/dtbo/dtbo.mk
-
-# AVB
-BOARD_AVB_ENABLE := true
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag
-BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 2
-
-# DRM
-TARGET_ENABLE_MEDIADRM_64 := true
-
-# Graphics
-TARGET_USES_HWC2 := true
-NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3
-
-# HIDL
-DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml
+# Hidl
 ODM_MANIFEST_SKUS += begonia
 ODM_MANIFEST_BEGONIA_FILES := $(DEVICE_PATH)/manifest_begonia.xml
 
-# Network Routing
-TARGET_IGNORES_FTP_PPTP_CONNTRACK_FAILURE := true
-
-# Partitions
-BOARD_FLASH_BLOCK_SIZE := 131072
-BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864
-BOARD_RECOVERYIMAGE_PARTITION_SIZE := 67108864
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3758096384
-BOARD_SYSTEMIMAGE_PARTITION_TYPE := ext4
-BOARD_USERDATAIMAGE_PARTITION_SIZE := 120116445184
-BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE := ext4
-BOARD_CACHEIMAGE_PARTITION_SIZE := 452984832
-BOARD_DTBOIMG_PARTITION_SIZE := 33554432
-BOARD_VENDORIMAGE_PARTITION_SIZE := 1610612736
-BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
-
-TARGET_COPY_OUT_PRODUCT := system/product
-TARGET_COPY_OUT_VENDOR := vendor
-
-TARGET_USERIMAGES_USE_EXT4 := true
-
-# Properties
-TARGET_SYSTEM_PROP += $(DEVICE_PATH)/system.prop
-TARGET_VENDOR_PROP += $(DEVICE_PATH)/vendor.prop
-
-# Recovery
-BOARD_HAS_LARGE_FILESYSTEM := true
-TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
-TARGET_RECOVERY_DEVICE_DIRS += $(DEVICE_PATH)
-TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/fstab.mt6785
-TARGET_RECOVERY_UI_BLANK_UNBLANK_ON_INIT := true
-
-# Releasetools
-TARGET_RELEASETOOLS_EXTENSIONS := $(DEVICE_PATH)
-
-# Security patch level
-VENDOR_SECURITY_PATCH := 2020-02-01
-
-# Sepolicy
-include device/mediatek/sepolicy/sepolicy.mk
-
-# Soong namespaces
-PRODUCT_SOONG_NAMESPACES += $(DEVICE_PATH)
-
-# VNDK
-BOARD_VNDK_VERSION := current
-PRODUCT_EXTRA_VNDK_VERSIONS := 28
-BOARD_VNDK_RUNTIME_DISABLE := true
-
 # Inherit from the proprietary version
 -include vendor/xiaomi/begonia/BoardConfigVendor.mk