diff --git a/ttp/titan_pocket/BoardConfig.mk b/ttp/titan_pocket/BoardConfig.mk index d54cdf0..2bdd459 100644 --- a/ttp/titan_pocket/BoardConfig.mk +++ b/ttp/titan_pocket/BoardConfig.mk @@ -1,29 +1,76 @@ -include build/make/target/board/BoardConfigGsiCommon.mk - TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-a -TARGET_CPU_ABI := arm64-v8a -TARGET_CPU_ABI2 := TARGET_CPU_VARIANT := generic +TARGET_CPU_ABI := arm64-v8a 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 -# TODO(jiyong) These might be SoC specific. -BOARD_ROOT_EXTRA_FOLDERS += firmware firmware/radio persist +ifneq ($(TARGET_BUILD_APPS)$(filter cts sdk vts10,$(MAKECMDGOALS)),) +# DO NOT USE +# DO NOT USE +# +# This architecture / CPU variant must NOT be used for any 64 bit +# platform builds. It is the lowest common denominator required +# to build an unbundled application or cts for all supported 32 and 64 bit +# platforms. +# +# If you're building a 64 bit platform (and not an application) the +# ARM-v8 specification allows you to assume all the features available in an +# armv7-a-neon CPU. You should set the following as 2nd arch/cpu variant: +# +# TARGET_2ND_ARCH_VARIANT := armv8-a +# TARGET_2ND_CPU_VARIANT := generic +# +# DO NOT USE +# DO NOT USE +TARGET_2ND_ARCH_VARIANT := armv7-a-neon +# DO NOT USE +# DO NOT USE +TARGET_2ND_CPU_VARIANT := generic +# DO NOT USE +# DO NOT USE +else +TARGET_2ND_ARCH_VARIANT := armv8-a +TARGET_2ND_CPU_VARIANT := generic +endif + +include build/make/target/board/BoardConfigGsiCommon.mk + +# b/240524886 +BUILD_EMULATOR_OPENGL := true + +TARGET_NO_KERNEL := false +TARGET_NO_VENDOR_BOOT := true +BOARD_USES_RECOVERY_AS_BOOT := true + +BOARD_KERNEL-4.19-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920 +BOARD_KERNEL-5.4_BOOTIMAGE_PARTITION_SIZE := 67108864 +BOARD_KERNEL-5.4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 67108864 +BOARD_KERNEL-5.4-GZ_BOOTIMAGE_PARTITION_SIZE := 47185920 +BOARD_KERNEL-5.4-GZ-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 47185920 +BOARD_KERNEL-5.4-LZ4_BOOTIMAGE_PARTITION_SIZE := 53477376 +BOARD_KERNEL-5.4-LZ4-ALLSYMS_BOOTIMAGE_PARTITION_SIZE := 53477376 +BOARD_USERDATAIMAGE_PARTITION_SIZE := 576716800 + +BOARD_RAMDISK_USE_LZ4 := true +BOARD_BOOT_HEADER_VERSION := 3 +BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) + +BOARD_KERNEL_BINARIES := kernel-4.19-gz kernel-5.4 kernel-5.4-gz kernel-5.4-lz4 +ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) +BOARD_KERNEL_BINARIES += kernel-5.4-allsyms kernel-5.4-gz-allsyms kernel-5.4-lz4-allsyms +endif + +# Some vendors still haven't cleaned up all device specific directories under +# root! + +# TODO(b/111434759, b/111287060) SoC specific hacks BOARD_ROOT_EXTRA_SYMLINKS += /vendor/lib/dsp:/dsp -BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/image:/firmware/image -BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt/verinfo:/firmware/verinfo +BOARD_ROOT_EXTRA_SYMLINKS += /mnt/vendor/persist:/persist +BOARD_ROOT_EXTRA_SYMLINKS += /vendor/firmware_mnt:/firmware # TODO(b/36764215): remove this setting when the generic system image # no longer has QCOM-specific directories under /. -BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy - -ifeq ($(BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE),) -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648 -else -BOARD_SYSTEMIMAGE_PARTITION_RESERVED_SIZE := 33554432 -endif \ No newline at end of file +BOARD_SEPOLICY_DIRS += build/make/target/board/generic_arm64/sepolicy \ No newline at end of file diff --git a/ttp/ttp.mk b/ttp/ttp.mk index 89161e2..6c1a548 100644 --- a/ttp/ttp.mk +++ b/ttp/ttp.mk @@ -1,23 +1,61 @@ -include build/make/target/product/aosp_arm64_ab.mk +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) + +# Enable mainline checking for excat this product name +ifeq (aosp_arm64,$(TARGET_PRODUCT)) +PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS := relaxed +endif + +# +# All components inherited here go to system_ext image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system_ext.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system_ext.mk) + +# +# All components inherited here go to product image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_product.mk) + +# +# All components inherited here go to vendor image +# +$(call inherit-product, $(SRC_TARGET_DIR)/product/emulator_vendor.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) + +# +# Special settings for GSI releasing +# +ifeq (aosp_arm64,$(TARGET_PRODUCT)) +$(call inherit-product, $(SRC_TARGET_DIR)/product/gsi_release.mk) +endif + PRODUCT_NAME := ttp PRODUCT_DEVICE := titan_pocket +PRODUCT_BRAND := Android +PRODUCT_MODEL := AOSP on ARM64 + +# include build/make/target/product/aosp_arm64_ab.mk + +# PRODUCT_NAME := ttp +# PRODUCT_DEVICE := titan_pocket #PRODUCT_BRAND := wephone #PRODUCT_MODEL := weOs on TTP # This is for a device -PRODUCT_CHARACTERISTICS := device +# PRODUCT_CHARACTERISTICS := device -PRODUCT_PACKAGE_OVERLAYS += device/wephone/ttp/overlay +# PRODUCT_PACKAGE_OVERLAYS += device/wephone/ttp/overlay -PRODUCT_SYSTEM_PROPERTIES += \ +# PRODUCT_SYSTEM_PROPERTIES += \ persist.bluetooth.bluetooth_audio_hal.disabled=true \ persist.sys.bt.unsupport.features=00000000 \ persist.sys.bt.unsupport.states=00000000 \ persist.sys.bt.unsupport.stdfeatures=000001 \ qemu.hw.mainkeys=1 -PRODUCT_COPY_FILES += \ +# PRODUCT_COPY_FILES += \ device/wephone/ttp/files/aw9523-key.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/aw9523-key.idc \ device/wephone/ttp/files/aw9523-key.kcm:$(TARGET_COPY_OUT_SYSTEM)/usr/keychars/aw9523-key.kcm \ device/wephone/ttp/files/aw9523-key.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/aw9523-key.kl \ @@ -26,7 +64,7 @@ PRODUCT_COPY_FILES += \ device/wephone/ttp/files/mtk-pad.idc:$(TARGET_COPY_OUT_SYSTEM)/usr/idc/mtk-pad.idc \ device/wephone/ttp/files/mtk-tpd.kl:$(TARGET_COPY_OUT_SYSTEM)/usr/keylayout/mtk-tpd.kl -PRODUCT_PACKAGES += \ +# PRODUCT_PACKAGES += \ BromiteSystemWebView \ Conversations \ Davx5 \ @@ -39,7 +77,7 @@ PRODUCT_PACKAGES += \ NextcloudNotes \ Wireguard -PRODUCT_PACKAGES -= \ +# PRODUCT_PACKAGES -= \ EasterEgg \ webview \ libwebviewchromium_loader \