From 180f58bc15b4fd6d4cfa34a9518f71aeff255b74 Mon Sep 17 00:00:00 2001 From: Michael Bestas Date: Sun, 23 Nov 2025 00:26:33 +0200 Subject: [PATCH] gs201: Remove unused flags Change-Id: Iaae480da1806b096b972f67cc994766884842e97 --- BoardConfig-common.mk | 186 --------------------------- aosp_common.mk | 5 - conf/egl.cfg | 1 - device.mk | 228 ++-------------------------------- wifi/qcom/BoardConfig-wifi.mk | 8 -- 5 files changed, 9 insertions(+), 419 deletions(-) delete mode 100644 conf/egl.cfg diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk index a282fe09..fabadac3 100644 --- a/BoardConfig-common.mk +++ b/BoardConfig-common.mk @@ -16,14 +16,6 @@ include build/make/target/board/BoardConfigMainlineCommon.mk include build/make/target/board/BoardConfigPixelCommon.mk -# HACK : To fix up after bring up multimedia devices. -TARGET_SOC := gs201 - -TARGET_SOC_NAME := google - -USES_DEVICE_GOOGLE_GS201 := true -$(call soong_config_set,googleDeviceConfig,target_soc,gs201) - TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-2a TARGET_CPU_ABI := arm64-v8a @@ -54,7 +46,6 @@ BOARD_KERNEL_CMDLINE += disable_dma32=on BOARD_BOOTCONFIG += androidboot.boot_devices=14700000.ufs TARGET_NO_BOOTLOADER := true -TARGET_NO_RADIOIMAGE := true BOARD_PREBUILT_BOOTIMAGE := $(wildcard $(TARGET_KERNEL_DIR)/boot.img) TARGET_NO_KERNEL := true BOARD_USES_GENERIC_KERNEL_IMAGE := true @@ -102,41 +93,6 @@ ifneq ($(PRODUCT_BUILD_PVMFW_IMAGE),false) AB_OTA_PARTITIONS += pvmfw endif -# EMULATOR common modules -BOARD_EMULATOR_COMMON_MODULES := liblight - -OVERRIDE_RS_DRIVER := libRSDriverArm.so -BOARD_EGL_CFG := device/google/gs201/conf/egl.cfg -#BOARD_USES_HGL := true -USE_OPENGL_RENDERER := true -NUM_FRAMEBUFFER_SURFACE_BUFFERS := 3 -BOARD_USES_EXYNOS5_COMMON_GRALLOC := true -BOARD_USES_ALIGN_RESTRICTION := false -BOARD_USES_GRALLOC_ION_SYNC := true - -# This should be the same value as USE_SWIFTSHADER in device.mk -BOARD_USES_SWIFTSHADER := false - -# Gralloc4 -ifeq ($(BOARD_USES_SWIFTSHADER),true) -$(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,true) -$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_basic,false) -$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_wideblk,false) -$(call soong_config_set,arm_gralloc,gralloc_init_afbc,false) -$(call soong_config_set,arm_gralloc,dpu_support_1010102_afbc,false) -else -$(call soong_config_set,arm_gralloc,gralloc_arm_no_external_afbc,false) -$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_basic,true) -$(call soong_config_set,arm_gralloc,mali_gpu_support_afbc_wideblk,true) -$(call soong_config_set,arm_gralloc,gralloc_init_afbc,true) -$(call soong_config_set,arm_gralloc,dpu_support_1010102_afbc,true) -endif # ifeq ($(BOARD_USES_SWIFTSHADER),true) - -$(call soong_config_set,arm_gralloc,gralloc_ion_sync_on_lock,$(BOARD_USES_GRALLOC_ION_SYNC)) - -# Graphics -#BOARD_USES_EXYNOS_DATASPACE_FEATURE := true - # Enable chain partition for system. BOARD_AVB_VBMETA_SYSTEM := system system_dlkm system_ext product BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem @@ -165,7 +121,6 @@ TARGET_USERIMAGES_USE_F2FS := true BOARD_USERDATAIMAGE_PARTITION_SIZE := 11796480000 PRODUCT_FS_COMPRESSION := 1 BOARD_FLASH_BLOCK_SIZE := 4096 -BOARD_MOUNT_SDCARD_RW := true # product.img BOARD_PRODUCTIMAGE_FILE_SYSTEM_TYPE := ext4 @@ -178,30 +133,6 @@ TARGET_COPY_OUT_SYSTEM_EXT := system_ext # persist.img BOARD_PERSISTIMAGE_FILE_SYSTEM_TYPE := ext4 -######################## -# Video Codec -######################## -# 1. Exynos C2 -BOARD_USE_CODEC2_HIDL_1_2 := true -BOARD_USE_CSC_FILTER := false -BOARD_USE_DEC_SW_CSC := true -BOARD_USE_ENC_SW_CSC := true -BOARD_SUPPORT_MFC_ENC_RGB := true -BOARD_USE_BLOB_ALLOCATOR := false -BOARD_SUPPORT_MFC_ENC_BT2020 := true -BOARD_SUPPORT_FLEXIBLE_P010 := true -$(call soong_config_set,video_codec,target_soc_name,$(TARGET_SOC_NAME)) -$(call soong_config_set_bool,video_codec,board_use_codec2_hidl_1_2,$(BOARD_USE_CODEC2_HIDL_1_2)) -$(call soong_config_set_bool,video_codec,board_use_csc_filter,$(BOARD_USE_CSC_FILTER)) -$(call soong_config_set_bool,video_codec,board_use_dec_sw_csc,$(BOARD_USE_DEC_SW_CSC)) -$(call soong_config_set_bool,video_codec,board_use_enc_sw_csc,$(BOARD_USE_ENC_SW_CSC)) -$(call soong_config_set_bool,video_codec,board_support_mfc_enc_rgb,$(BOARD_SUPPORT_MFC_ENC_RGB)) -$(call soong_config_set_bool,video_codec,board_use_blob_allocator,$(BOARD_USE_BLOB_ALLOCATOR)) -$(call soong_config_set_bool,video_codec,board_support_mfc_enc_bt2020,$(BOARD_SUPPORT_MFC_ENC_BT2020)) -$(call soong_config_set_bool,video_codec,board_support_flexible_p010,$(BOARD_SUPPORT_FLEXIBLE_P010)) -$(call soong_config_set_bool,video_codec,board_use_codec2_aidl,$(if $(BOARD_USE_CODEC2_AIDL),true,false)) -######################## - BOARD_SUPER_PARTITION_SIZE := 8531214336 BOARD_SUPER_PARTITION_GROUPS := google_dynamic_partitions # Set size to BOARD_SUPER_PARTITION_SIZE - overhead (4MiB) (b/182237294) @@ -222,137 +153,23 @@ BOARD_USES_SYSTEM_DLKMIMAGE := true BOARD_SYSTEM_DLKMIMAGE_FILE_SYSTEM_TYPE := ext4 TARGET_COPY_OUT_SYSTEM_DLKM := system_dlkm -# -# AUDIO & VOICE -# -BOARD_USES_GENERIC_AUDIO := true - -$(call soong_config_set,aoc_audio_func,ext_hidl,true) - -ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) -$(call soong_config_set,aoc_audio_func,aosp_build,true) -endif - -# Primary AudioHAL Configuration -#BOARD_USE_COMMON_AUDIOHAL := true -#BOARD_USE_CALLIOPE_AUDIOHAL := false -#BOARD_USE_AUDIOHAL := true - -# Compress Offload Configuration -#BOARD_USE_OFFLOAD_AUDIO := true -#BOARD_USE_OFFLOAD_EFFECT := false - -# SoundTriggerHAL Configuration -#BOARD_USE_SOUNDTRIGGER_HAL := false - -# Vibrator HAL actuator model and adaptive haptics configuration -$(call soong_config_set,haptics,actuator_model,$(ACTUATOR_MODEL)) -$(call soong_config_set,haptics,adaptive_haptics_feature,$(ADAPTIVE_HAPTICS_FEATURE)) - -# HWComposer -BOARD_HWC_VERSION := hwc3 -TARGET_RUNNING_WITHOUT_SYNC_FRAMEWORK := false -BOARD_HDMI_INCAPABLE := true -TARGET_USES_HWC2 := true -HWC_SUPPORT_RENDER_INTENT := true -HWC_SUPPORT_COLOR_TRANSFORM := true -#BOARD_USES_DISPLAYPORT := true -# if AFBC is enabled, must set ro.vendor.ddk.set.afbc=1 -BOARD_USES_EXYNOS_AFBC_FEATURE := true -#BOARD_USES_HDRUI_GLES_CONVERSION := true - -BOARD_LIBACRYL_DEFAULT_COMPOSITOR := fimg2d_gs201 -BOARD_LIBACRYL_G2D_HDR_PLUGIN := libacryl_hdr_plugin -$(call soong_config_set,acryl,libacryl_g2d_hdr_plugin,//hardware/google/graphics/gs201/libacryl_plugins:libacryl_hdr_plugin) -$(call soong_config_set,acryl,libacryl_c_include,hardware/google/graphics/$(TARGET_BOARD_PLATFORM)/libcap) - -# HWCServices -BOARD_USES_HWC_SERVICES := true - -# WiFiDisplay -# BOARD_USES_VIRTUAL_DISPLAY := true -# BOARD_USES_VDS_EXYNOS_HWC := true -# BOARD_USES_WIFI_DISPLAY:= true -# BOARD_USES_EGL_SURFACE_FOR_COMPOSITION_MIXED := true -# BOARD_USES_VDS_YUV420SPM := true -# BOARD_USES_VDS_OTHERFORMAT := true -# BOARD_USES_VDS_DEBUG_FLAG := true -# BOARD_USES_DISABLE_COMPOSITIONTYPE_GLES := true -# BOARD_USES_SECURE_ENCODER_ONLY := true -# BOARD_USES_TSMUX := true - -# SCALER -BOARD_USES_DEFAULT_CSC_HW_SCALER := true -BOARD_DEFAULT_CSC_HW_SCALER := 4 -BOARD_USES_SCALER_M2M1SHOT := true - # Device Tree -BOARD_USES_DT := true BOARD_INCLUDE_DTB_IN_BOOTIMG := true BOARD_PREBUILT_DTBIMAGE_DIR := $(TARGET_KERNEL_DIR) BOARD_PREBUILT_DTBOIMAGE := $(BOARD_PREBUILT_DTBIMAGE_DIR)/dtbo.img -# PLATFORM LOG -TARGET_USES_LOGD := true - -# LIBHWJPEG -#TARGET_USES_UNIVERSAL_LIBHWJPEG := true -#LIBHWJPEG_HWSCALER_ID := 0 - -#Keymaster -#BOARD_USES_KEYMASTER_VER1 := true - -#FMP -#BOARD_USES_FMP_DM_CRYPT := true -#BOARD_USES_FMP_FSCRYPTO := true BOARD_USES_METADATA_PARTITION := true -# SKIA -#BOARD_USES_SKIA_MULTITHREADING := true -#BOARD_USES_FIMGAPI_V5X := true - -# SECCOMP Policy -BOARD_SECCOMP_POLICY = device/google/gs201/seccomp_policy - -#CURL -BOARD_USES_CURL := true - -# Sensor HAL -BOARD_USES_EXYNOS_SENSORS_DUMMY := true - -# VISION -# Exynos vision framework (EVF) -#TARGET_USES_EVF := true -# HW acceleration -#TARGET_USES_VPU_KERNEL := true -#TARGET_USES_SCORE_KERNEL := true -#TARGET_USES_CL_KERNEL := false - # exynos RIL -TARGET_EXYNOS_RIL_SOURCE := true ENABLE_VENDOR_RIL_SERVICE := true -# GNSS -# BOARD_USES_EXYNOS_GNSS_DUMMY := true - # Bluetooth defines # TODO(b/123695868): Remove the need for this BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := \ build/make/target/board/mainline_arm64/bluetooth -#VNDK -BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true -BOARD_VNDK_VERSION := current - -# H/W align restriction of MM IPs -BOARD_EXYNOS_S10B_FORMAT_ALIGN := 64 - # Boot.img BOARD_RAMDISK_USE_LZ4 := true -#BOARD_KERNEL_BASE := 0x80000000 -#BOARD_KERNEL_PAGESIZE := 2048 -#BOARD_KERNEL_OFFSET := 0x80000 -#BOARD_RAMDISK_OFFSET := 0x4000000 BOARD_BOOT_HEADER_VERSION := 4 BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) @@ -411,9 +228,6 @@ endif BOARD_SYSTEM_KERNEL_MODULES_LOAD := $(strip $(shell cat $(KERNEL_MODULE_DIR)/system_dlkm.modules.load 2>/dev/null)) BOARD_SYSTEM_KERNEL_MODULES := $(addprefix $(KERNEL_MODULE_DIR)/, $(notdir $(BOARD_SYSTEM_KERNEL_MODULES_LOAD))) -# Using BUILD_COPY_HEADERS -BUILD_BROKEN_USES_BUILD_COPY_HEADERS := true - include device/google/gs201/sepolicy/gs201-sepolicy.mk # Battery options diff --git a/aosp_common.mk b/aosp_common.mk index e9e6be98..28334f23 100644 --- a/aosp_common.mk +++ b/aosp_common.mk @@ -47,8 +47,3 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk) ifneq ($(BOARD_WITHOUT_RADIO),true) $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) endif - -#$(call inherit-product, device/google/gs201/device.mk) - -# TODO: fix -# PRODUCT_RESTRICT_VENDOR_FILES := all diff --git a/conf/egl.cfg b/conf/egl.cfg deleted file mode 100644 index 4515dfd6..00000000 --- a/conf/egl.cfg +++ /dev/null @@ -1 +0,0 @@ -0 1 mali diff --git a/device.mk b/device.mk index 77e66b48..a137b1dc 100644 --- a/device.mk +++ b/device.mk @@ -59,12 +59,6 @@ VENDOR_SECURITY_PATCH := 2025-08-05 # Set boot SPL BOOT_SECURITY_PATCH := 2025-08-05 -# TODO(b/207450311): Remove this flag once implemented -USE_PIXEL_GRALLOC := false -ifeq ($(USE_PIXEL_GRALLOC),true) - PRODUCT_SOONG_NAMESPACES += hardware/google/gchips/GrallocHAL -endif - PRODUCT_SOONG_NAMESPACES += \ hardware/google/av \ hardware/google/interfaces \ @@ -72,11 +66,6 @@ PRODUCT_SOONG_NAMESPACES += \ device/google/gs201 \ device/google/gs201/powerstats -ifeq ($(RELEASE_AVF_ENABLE_LLPVM_CHANGES),true) - # Set the environment variable to enable the Secretkeeper HAL service. - SECRETKEEPER_ENABLED := true -endif - # OEM Unlock reporting PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ ro.oem_unlock_supported=1 @@ -86,8 +75,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ ro.telephony.default_network=27 \ persist.vendor.ril.db_ecc.use.iccid_to_plmn=1 \ persist.vendor.ril.db_ecc.id.type=5 - #rild.libpath=/system/lib64/libsec-ril.so \ - #rild.libargs=-d /dev/umts_ipc0 # SIT-RIL Logging setting PRODUCT_PROPERTY_OVERRIDES += \ @@ -163,48 +150,11 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PROPERTY_OVERRIDES += \ telephony.active_modems.max_count=2 -USE_LASSEN_OEMHOOK := true -# The "power-anomaly-sitril" is added into PRODUCT_SOONG_NAMESPACES when -# $(USE_LASSEN_OEMHOOK) is true and $(BOARD_WITHOUT_RADIO) is not true. -ifneq ($(BOARD_WITHOUT_RADIO),true) - $(call soong_config_set,sitril,use_lassen_oemhook_with_radio,true) -endif - -# Use for GRIL -USES_LASSEN_MODEM := true -$(call soong_config_set, vendor_ril_google_feature, use_lassen_modem, true) -ifneq ($(BOARD_WITHOUT_RADIO),true) -$(call soong_config_set_bool,grilservice,use_google_qns,true) -endif - -ifeq ($(USES_GOOGLE_DIALER_CARRIER_SETTINGS),true) -USE_GOOGLE_DIALER := true -USE_GOOGLE_CARRIER_SETTINGS := true -endif - -ifeq ($(USES_GOOGLE_PREBUILT_MODEM_SVC),true) -USE_GOOGLE_PREBUILT_MODEM_SVC := true -endif - -# Audio client implementation for RIL -USES_GAUDIO := true - -# ###################### -# GRAPHICS - GPU (begin) - -# Must match BOARD_USES_SWIFTSHADER in BoardConfig.mk -USE_SWIFTSHADER := false - # HWUI -ifeq ($(USE_SWIFTSHADER),true) - TARGET_USES_VULKAN = false -else - TARGET_USES_VULKAN = true -endif - -$(call soong_config_set,pixel_mali,soc,$(TARGET_BOARD_PLATFORM)) +TARGET_USES_VULKAN = true include device/google/gs-common/gpu/gpu.mk + PRODUCT_PACKAGES += \ csffw_image_prebuilt__firmware_prebuilt_todx_mali_csffw.bin \ libGLES_mali \ @@ -221,6 +171,10 @@ PRODUCT_PACKAGES += \ mali_icd__customer_pixel_opencl-icd_ARM32.icd endif +PRODUCT_VENDOR_PROPERTIES += \ + ro.hardware.egl=mali \ + ro.hardware.vulkan=mali + # Mali Configuration Properties PRODUCT_VENDOR_PROPERTIES += \ vendor.mali.platform.config=/vendor/etc/mali/platform.config \ @@ -237,22 +191,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2025-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml \ frameworks/native/data/etc/android.software.opengles.deqp.level-2025-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.opengles.deqp.level.xml -ifeq ($(USE_SWIFTSHADER),true) -PRODUCT_PACKAGES += \ - vulkan.pastel -endif - -ifeq ($(USE_SWIFTSHADER),true) -PRODUCT_VENDOR_PROPERTIES += \ - ro.hardware.egl = mali \ - persist.graphics.egl = angle \ - ro.hardware.vulkan = pastel -else -PRODUCT_VENDOR_PROPERTIES += \ - ro.hardware.egl = mali \ - ro.hardware.vulkan = mali -endif - # Configure EGL blobcache PRODUCT_VENDOR_PROPERTIES += \ ro.egl.blobcache.multifile=true \ @@ -265,14 +203,10 @@ PRODUCT_VENDOR_PROPERTIES += \ # b/295257834 Add HDR shaders to SurfaceFlinger's pre-warming cache PRODUCT_VENDOR_PROPERTIES += ro.surface_flinger.prime_shader_cache.ultrahdr=1 -# GRAPHICS - GPU (end) -# #################### - # Device Manifest, Device Compatibility Matrix for Treble DEVICE_MANIFEST_FILE := \ device/google/gs201/manifest.xml -BOARD_USE_CODEC2_AIDL := V1 ifneq (,$(filter aosp_%,$(TARGET_PRODUCT))) DEVICE_MANIFEST_FILE += \ device/google/gs201/manifest_media_aosp.xml @@ -308,13 +242,8 @@ PRODUCT_COPY_FILES += \ PRODUCT_COPY_FILES += \ device/google/gs201/conf/init.gs201.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.rc -ifneq (,$(filter 5.%, $(TARGET_LINUX_KERNEL_VERSION))) -PRODUCT_COPY_FILES += \ - device/google/gs201/storage/5.10/init.gs201.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.storage.rc -else PRODUCT_COPY_FILES += \ device/google/gs201/storage/6.1/init.gs201.storage.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/hw/init.gs201.storage.rc -endif # Recovery files PRODUCT_COPY_FILES += \ @@ -350,7 +279,6 @@ PRODUCT_HOST_PACKAGES += \ include device/google/gs-common/chre/hal.mk PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.context_hub.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.context_hub.xml -CHRE_DEDICATED_TRANSPORT_CHANNEL_ENABLED := true PRODUCT_PACKAGES += \ preloaded_nanoapps.json @@ -376,9 +304,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PACKAGES += \ tlrpmb -# Touch firmware -#PRODUCT_COPY_FILES += \ - device/google/gs201/firmware/touch/s6sy761.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/s6sy761.fw # Touch PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.touchscreen.multitouch.jazzhand.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.touchscreen.multitouch.jazzhand.xml @@ -435,37 +360,11 @@ PRODUCT_PACKAGES += \ # Audio HALs # -# Audio Configurations -USE_LEGACY_LOCAL_AUDIO_HAL := false -USE_XML_AUDIO_POLICY_CONF := 1 - # Enable AAudio MMAP/NOIRQ data path. PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_policy=2 PRODUCT_PROPERTY_OVERRIDES += aaudio.mmap_exclusive_policy=2 PRODUCT_PROPERTY_OVERRIDES += aaudio.hw_burst_min_usec=2000 -# Calliope firmware overwrite -#PRODUCT_COPY_FILES += \ - device/google/gs201/firmware/calliope_dram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram.bin \ - device/google/gs201/firmware/calliope_sram.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_sram.bin \ - device/google/gs201/firmware/calliope_dram_2.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_dram_2.bin \ - device/google/gs201/firmware/calliope_sram_2.bin:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope_sram_2.bin \ - device/google/gs201/firmware/calliope2.dt:$(TARGET_COPY_OUT_VENDOR)/firmware/calliope2.dt \ - -# Cannot reference variables defined in BoardConfig.mk, uncomment this if -# BOARD_USE_OFFLOAD_AUDIO and BOARD_USE_OFFLOAD_EFFECT are true -## AudioEffectHAL library -#PRODUCT_PACKAGES += \ -# libexynospostprocbundle - -# Cannot reference variables defined in BoardConfig.mk, uncomment this if -# BOARD_USE_SOUNDTRIGGER_HAL is true -#PRODUCT_PACKAGES += \ -# sound_trigger.primary.maran9820 - -# A-Box Service Daemon -#PRODUCT_PACKAGES += main_abox - # Libs PRODUCT_PACKAGES += \ com.android.future.usb.accessory @@ -487,34 +386,7 @@ include device/google/gs201/widevine/device.mk PRODUCT_PACKAGES += \ liboemcrypto \ -PANTHER_PRODUCT := %panther -CHEETAH_PRODUCT := %cheetah -LYNX_PRODUCT := %lynx -FELIX_PRODUCT := %felix -CLOUDRIPPER_PRODUCT := %cloudripper -TANGOR_PRODUCT := %tangorpro -ifneq (,$(filter $(PANTHER_PRODUCT), $(TARGET_PRODUCT))) - LOCAL_TARGET_PRODUCT := panther -else ifneq (,$(filter $(CHEETAH_PRODUCT), $(TARGET_PRODUCT))) - LOCAL_TARGET_PRODUCT := cheetah -else ifneq (,$(filter $(LYNX_PRODUCT), $(TARGET_PRODUCT))) - LOCAL_TARGET_PRODUCT := lynx -else ifneq (,$(filter $(FELIX_PRODUCT), $(TARGET_PRODUCT))) - LOCAL_TARGET_PRODUCT := felix -else ifneq (,$(filter $(CLOUDRIPPER_PRODUCT), $(TARGET_PRODUCT))) - LOCAL_TARGET_PRODUCT := cloudripper -else ifneq (,$(filter $(TANGOR_PRODUCT), $(TARGET_PRODUCT))) - LOCAL_TARGET_PRODUCT := tangorpro -else - # WAR: continue defaulting to slider build on gs201 to not - # break dev targets such as ravenclaw - LOCAL_TARGET_PRODUCT := slider -endif - -# Lyric Camera HAL settings include device/google/gs-common/camera/lyric.mk -$(call soong_config_set,lyric,soc,gs201) -$(call soong_config_set,google3a_config,soc,gs201) # WiFi PRODUCT_PACKAGES += \ @@ -546,16 +418,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/virtual_ab_ota/launch_with_ven $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_ramdisk.mk) # Titan-M -ifeq (,$(filter true, $(BOARD_WITHOUT_DTLS))) include device/google/gs-common/dauntless/gsc.mk -endif - -# Copy Camera HFD Setfiles -#PRODUCT_COPY_FILES += \ - device/google/gs201/firmware/camera/libhfd/default_configuration.hfd.cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/default_configuration.hfd.cfg.json \ - device/google/gs201/firmware/camera/libhfd/pp_cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/pp_cfg.json \ - device/google/gs201/firmware/camera/libhfd/tracker_cfg.json:$(TARGET_COPY_OUT_VENDOR)/firmware/tracker_cfg.json \ - device/google/gs201/firmware/camera/libhfd/WithLightFixNoBN.SDNNmodel:$(TARGET_COPY_OUT_VENDOR)/firmware/WithLightFixNoBN.SDNNmodel # WiFi PRODUCT_COPY_FILES += \ @@ -584,12 +447,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.camera.full.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.full.xml\ frameworks/native/data/etc/android.hardware.camera.raw.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.camera.raw.xml\ -#PRODUCT_COPY_FILES += \ - frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ - frameworks/native/data/etc/android.hardware.wifi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.xml \ - frameworks/native/data/etc/android.hardware.wifi.direct.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.direct.xml \ - frameworks/native/data/etc/android.hardware.wifi.passpoint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.passpoint.xml \ - PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.audio.low_latency.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.low_latency.xml \ frameworks/native/data/etc/android.hardware.audio.pro.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.pro.xml \ @@ -647,12 +504,6 @@ PRODUCT_COPY_FILES += \ # limit DPP downscale ratio PRODUCT_DEFAULT_PROPERTY_OVERRIDES += vendor.hwc.dpp.downscale=2 -# Cannot reference variables defined in BoardConfig.mk, uncomment this if -# BOARD_USES_EXYNOS_DSS_FEATURE is true -## set the dss enable status setup -#PRODUCT_PROPERTY_OVERRIDES += \ -# ro.exynos.dss=1 - # Cannot reference variables defined in BoardConfig.mk, uncomment this if # BOARD_USES_EXYNOS_AFBC_FEATURE is true # set the dss enable status setup @@ -675,12 +526,6 @@ PRODUCT_PACKAGES += wpa_supplicant.conf WIFI_PRIV_CMD_UPDATE_MBO_CELL_STATUS := enabled -#################################### -## VIDEO -#################################### - -$(call soong_config_set,bigo,soc,gs201) - # 1. Codec 2.0 # for settings used by different C2 hal include device/google/gs-common/mediacodec/common/mediacodec_common.mk @@ -696,13 +541,8 @@ PRODUCT_PROPERTY_OVERRIDES += \ debug.stagefright.ccodec_delayed_params=1 \ ro.vendor.gpu.dataspace=1 -ifneq ($(BOARD_USE_CODEC2_AIDL), ) PRODUCT_PROPERTY_OVERRIDES += \ debug.stagefright.c2-poolmask=1507328 -else -PRODUCT_PROPERTY_OVERRIDES += \ - debug.stagefright.c2-poolmask=458752 -endif # Create input surface on the framework side PRODUCT_PROPERTY_OVERRIDES += \ @@ -714,15 +554,6 @@ PRODUCT_PROPERTY_OVERRIDES += media.c2.hal.selection=aidl PRODUCT_COPY_FILES += \ device/google/gs201/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ device/google/gs201/media_codecs_performance.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_performance.xml -#################################### - -# Telephony -#PRODUCT_COPY_FILES += \ - frameworks/av/media/libstagefright/data/media_codecs_google_telephony.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_telephony.xml - -# CBD (CP booting deamon) -CBD_USE_V2 := true -CBD_PROTOCOL_SIT := true # setup dalvik vm configs. $(call inherit-product, frameworks/native/build/phone-xhdpi-6144-dalvik-heap.mk) @@ -733,11 +564,6 @@ PRODUCT_TAGS += dalvik.gc.type-precise PRODUCT_PACKAGES += \ libexynosvision -ifeq ($(TARGET_USES_CL_KERNEL),true) -PRODUCT_PACKAGES += \ - libopenvx-opencl -endif - # Trusty (KM, GK, Storage) $(call inherit-product, system/core/trusty/trusty-storage.mk) $(call inherit-product, system/core/trusty/trusty-base.mk) @@ -753,7 +579,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ trusty_metricsd -$(call soong_config_set,google_displaycolor,displaycolor_platform,gs201) PRODUCT_PACKAGES += \ android.hardware.composer.hwc3-service.pixel \ libdisplaycolor @@ -806,35 +631,12 @@ PRODUCT_PACKAGES += \ libstagefright_hdcp \ libskia_opt -#PRODUCT_PACKAGES += \ - mfc_fw.bin \ - calliope_sram.bin \ - calliope_dram.bin \ - calliope_iva.bin \ - vts.bin - ifneq ($(BOARD_WITHOUT_RADIO),true) PRODUCT_PACKAGES += ShannonIms PRODUCT_PACKAGES += ShannonRcs endif -# Exynos RIL and telephony -# Multi SIM(DSDS) -SIM_COUNT := 2 -$(call soong_config_set,sim,sim_count,$(SIM_COUNT)) -SUPPORT_MULTI_SIM := true -# Support NR -SUPPORT_NR := true -# Support 5G on both stacks -SUPPORT_NR_DS := true -# Using IRadio 2.0 -USE_RADIO_HAL_2_0 := true -# Support SecureElement HAL for HIDL -USE_SE_HIDL := true -# Using Early Send Device Info -USE_EARLY_SEND_DEVICE_INFO := true - ifneq ($(BOARD_WITHOUT_RADIO),true) # modem logging binary/configs PRODUCT_PACKAGES += modem_logging_control @@ -860,7 +662,6 @@ PRODUCT_COPY_FILES += \ device/google/$(TARGET_BOARD_PLATFORM)/conf/fstab.modem:$(TARGET_COPY_OUT_VENDOR)/etc/fstab.modem \ device/google/gs201/location/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer - include device/google/gs-common/gps/brcm/device.mk endif @@ -868,7 +669,6 @@ endif $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) include device/google/gs-common/sensors/sensors.mk -$(call soong_config_set,usf,target_soc,gs201) PRODUCT_COPY_FILES += \ device/google/gs201/default-permissions.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/default-permissions/default-permissions.xml \ @@ -888,17 +688,11 @@ PRODUCT_PACKAGES += \ android.hardware.health-service.gs201 \ android.hardware.health-service.gs201_recovery \ -# Audio # Audio HAL Server & Default Implementations include device/google/gs-common/audio/hidl_gs201.mk -## AoC soong -$(call soong_config_set,aoc,target_soc,$(TARGET_BOARD_PLATFORM)) -$(call soong_config_set,aoc,target_product,$(TARGET_PRODUCT)) - -# ## Audio properties -ifneq (,$(filter $(TANGOR_PRODUCT), $(TARGET_PRODUCT))) +ifneq (,$(filter %tangorpro, $(TARGET_PRODUCT))) PRODUCT_PROPERTY_OVERRIDES += \ ro.config.vc_call_vol_steps=7 \ ro.config.media_vol_steps=20 \ @@ -934,8 +728,6 @@ PRODUCT_PROPERTY_OVERRIDES += persist.vendor.enable.thermal.genl=true # EdgeTPU include device/google/gs-common/edgetpu/edgetpu.mk -# Config variables for TPU chip on device. -$(call soong_config_set,edgetpu_config,chip,janeiro) # TPU firmware PRODUCT_PACKAGES += edgetpu-janeiro.fw @@ -955,6 +747,8 @@ PRODUCT_PACKAGES += \ # pKVM $(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk) PRODUCT_BUILD_PVMFW_IMAGE := true +# Set the environment variable to enable the Secretkeeper HAL service. +SECRETKEEPER_ENABLED := true # Enable to build standalone vendor_kernel_boot image. PRODUCT_BUILD_VENDOR_KERNEL_BOOT_IMAGE := true @@ -984,9 +778,6 @@ include hardware/google/pixel/common/pixel-common-device.mk # Pixel Logger include hardware/google/pixel/PixelLogger/PixelLogger.mk -# RadioExt Version -USES_RADIOEXT_V1_5 = true - # Wifi ext include hardware/google/pixel/wifi_ext/device.mk @@ -1015,7 +806,6 @@ PRODUCT_PACKAGES += ufs_firmware_update.sh include device/google/gs-common/touch/twoshay/aidl_gs101.mk include device/google/gs-common/touch/twoshay/twoshay.mk - # Allow longer timeout for incident report generation in bugreport # Overriding in /product partition instead of /vendor intentionally, # since it can't be overridden from /vendor. diff --git a/wifi/qcom/BoardConfig-wifi.mk b/wifi/qcom/BoardConfig-wifi.mk index 13692770..448c861c 100644 --- a/wifi/qcom/BoardConfig-wifi.mk +++ b/wifi/qcom/BoardConfig-wifi.mk @@ -25,15 +25,10 @@ BOARD_HOSTAPD_PRIVATE_LIB := //hardware/qcom/wlan/wcn6740/qcwcn/wpa_supplicant_8 BOARD_WPA_SUPPLICANT_DRIVER := NL80211 BOARD_HOSTAPD_DRIVER := NL80211 WPA_SUPPLICANT_VERSION := VER_0_8_X -CONFIG_IEEE80211AX := true -# BOARD_HAS_QCOM_WLAN := true -# CONFIG_ACS := true # Wifi interface combination - {1 STA + 1 of (P2P or NAN)} or {1 AP} WIFI_HAL_INTERFACE_COMBINATIONS := {{{STA}, 1}, {{P2P, NAN}, 1}}, {{{AP}, 1}} WIFI_HIDL_FEATURE_AWARE := true -WIFI_FEATURE_WIFI_EXT_HAL := true -WIFI_FEATURE_IMU_DETECTION := true WIFI_HIDL_UNIFIED_SUPPLICANT_SERVICE_RC_ENTRY := true # Avoid Wifi reset on MAC Address change # WIFI_AVOID_IFACE_RESET_MAC_CHANGE := true @@ -50,6 +45,3 @@ PRODUCT_COPY_FILES += \ # Add BOARD_WLAN_CHIP to soong_config $(call soong_config_set,qcom_wifi,board_wlan_chip,wcn6740) - -# Add WIFI_FEATURE_IMU_DETECTION to soong_config -$(call soong_config_set,wifi,feature_imu_detection,$(WIFI_FEATURE_IMU_DETECTION))