Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 270da9e9 authored by Bharath's avatar Bharath
Browse files

FP3: Clean up device makefiles 

* Drop all unused Board flags
* Drop all module declarations that are not defined.

Change-Id: Ice4a07991d52cb60d400122a2bdbaf30a7886a22
parent ddc92cc5

BoardConfig.mk

+2 −33
Original line number Diff line number Diff line
@@ -81,7 +81,6 @@ BOARD_SUPPORTS_QAHW := false 
MM_AUDIO_ENABLED_FTM := true

TARGET_USES_QCOM_MM_AUDIO := true



#AUDIO_FEATURE_ENABLED_VOICE_CONCURRENCY := true

AUDIO_FEATURE_ENABLED_AAC_ADTS_OFFLOAD := true

AUDIO_FEATURE_ENABLED_ALAC_OFFLOAD := false

AUDIO_FEATURE_ENABLED_APE_OFFLOAD := true
@@ -112,14 +111,12 @@ USE_CUSTOM_AUDIO_POLICY := 1 
# Bluetooth

BOARD_ANT_WIRELESS_DEVICE := "vfs-prerelease"

BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(DEVICE_PATH)/bluetooth

BOARD_HAVE_BLUETOOTH := true

BOARD_HAVE_BLUETOOTH_QCOM := true





# Bootloader

TARGET_BOOTLOADER_BOARD_NAME := FP3

TARGET_NO_BOOTLOADER := false

# BOOTLOADER_GCC_VERSION := arm-eabi-4.8





# Broken Flags
@@ -127,7 +124,6 @@ BUILD_BROKEN_ELF_PREBUILT_PRODUCT_COPY_FILES := true 




# Camera

TARGET_USES_QTI_CAMERA_DEVICE := true

USE_CAMERA_STUB := true
@@ -167,7 +163,7 @@ TARGET_FS_CONFIG_GEN += \ 




# GPS

BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := $(TARGET_BOARD_PLATFORM)

BOARD_VENDOR_QCOM_GPS_LOC_API_HARDWARE := default # from gps/gps_vendor_board.mk

LOC_HIDL_VERSION := 4.0
@@ -189,10 +185,6 @@ DEVICE_MANIFEST_FILE := $(DEVICE_PATH)/manifest.xml 
DEVICE_MATRIX_FILE := $(DEVICE_PATH)/compatibility_matrix.xml





# INIT

# TARGET_INIT_VENDOR_LIB := libinit_msm #Important





# Kernel

BOARD_KERNEL_BASE        := 0x80000000

BOARD_KERNEL_CMDLINE += androidboot.hardware=qcom msm_rtb.filter=0x237
@@ -213,7 +205,6 @@ TARGET_KERNEL_HEADER_ARCH := arm64 
TARGET_KERNEL_SOURCE := kernel/fairphone/sdm632

TARGET_KERNEL_VERSION := 4.9

TARGET_USES_UNCOMPRESSED_KERNEL := false

TARGET_USES_UNCOMPRESSED_KERNEL := false



# Declare boot header

BOARD_BOOT_HEADER_VERSION := 1
@@ -228,21 +219,11 @@ TARGET_PROVIDES_LIBLIGHT := true 
TARGET_MOUNT_POINTS_SYMLINKS := false





# NFC

BOARD_NFC_CHIPSET := pn553

TARGET_USES_NQ_NFC := true





#Enable peripheral manager

TARGET_PER_MGR_ENABLED := true





# Platform - UM_3_18_FAMILY

TARGET_BOARD_PLATFORM := msm8953





# Power

TARGET_HAS_NO_WLAN_STATS := true

TARGET_USES_INTERACTION_BOOST := true
@@ -254,8 +235,6 @@ TARGET_RECOVERY_FSTAB := $(DEVICE_PATH)/rootdir/etc/recovery.fstab 




# RIL

TARGET_PROVIDES_QTI_TELEPHONY_JAR := true

TARGET_USES_OLD_MNC_FORMAT := true

ENABLE_VENDOR_RIL_SERVICE := true
@@ -284,16 +263,6 @@ BOARD_AVB_SYSTEM_ROLLBACK_INDEX_LOCATION := 2 
# Disable verity and descriptor checking

BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --set_hashtree_disabled_flag



# When AVB 2.0 is enabled, dm-verity is enabled differently,

# below definitions are only required for AVB 1.0

ifeq ($(BOARD_AVB_ENABLE),false)

# dm-verity definitions

    PRODUCT_SUPPORTS_VERITY := true

    PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/bootdevice/by-name/system

    PRODUCT_VENDOR_VERITY_PARTITION := /dev/block/bootdevice/by-name/vendor

    $(call inherit-product, build/target/product/verity.mk)

endif





# Vendor Security Patch Level

VENDOR_SECURITY_PATCH := "2022-10-05"

device.mk

+5 −25
Original line number Diff line number Diff line
@@ -94,7 +94,6 @@ PRODUCT_PACKAGES += \ 
    audio.usb.default \

    libaacwrapper \

    libaudio-resampler \

    libautohal \

    libqcompostprocbundle \

    libqcomvisualizer \

    libqcomvoiceprocessing \
@@ -178,10 +177,9 @@ PRODUCT_PACKAGES += \ 
    android.hardware.camera.provider@2.4-service \

    camera.device@1.0-impl \

    camera.device@3.2-impl:32 \

    libbson.vendor \

    libxml2 \

    vendor.qti.hardware.camera.device@1.0 \

    vendor.qti.hardware.camera.device@1.0_vendor

    vendor.qti.hardware.camera.device@1.0.vendor



PRODUCT_PROPERTY_OVERRIDES += \

    persist.vendor.camera.isp.clock.optmz=0 \
@@ -304,18 +302,11 @@ PRODUCT_PACKAGES += \ 
    libbatching \

    libgeofencing \

    libgnss \

    libgnsspps \

    libsynergy_loc_api \

    libgps.utils



PRODUCT_PACKAGES += \

    apdr.conf \

    flp.conf \

    gps.conf \

    izat.conf \

    lowi.conf \

    sap.conf \

    xtwifi.conf

    gps.conf



# gps/location secuity configuration file

PRODUCT_COPY_FILES += \
@@ -380,12 +371,9 @@ PRODUCT_PACKAGES += \ 
    ueventd.qcom.rc \

    vold.fstab



# CRDA += init.crda.sh #TODO fix CRDA packages later



#Add init.qcom.test.rc to PRODUCT_PACKAGES_DEBUG list

PRODUCT_PACKAGES += \

    init.qcom.test.rc \

    init.qcom.debug.sh

    init.qcom.test.rc





# IPACM
@@ -437,9 +425,6 @@ PRODUCT_COPY_FILES += \ 
    frameworks/av/media/libstagefright/data/media_codecs_google_video_le.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_google_video_le.xml



# Media / StagefrightCodec 2.0

PRODUCT_PACKAGES += \

    libstagefright_ccodec



PRODUCT_PROPERTY_OVERRIDES += debug.stagefright.omx_default_rank=0



# OMX
@@ -486,11 +471,8 @@ PRODUCT_PACKAGES += \ 
    com.nxp.nfc.nq.xml \

    libnqnfc-nci \

    libnqnfc_nci_jni \

    libnqp61-jcop-kit \

    nfc_nci.nqx.default \

    nqnfcee_access.xml \

    nfc_nci.nqx.default.hw \

    nqnfcinfo \

    nqnfcse_access.xml \

    vendor.nxp.hardware.nfc@2.0-service



# NFC Config
@@ -695,14 +677,12 @@ PRODUCT_PACKAGES += \ 
    hostapd \

    hostapd_cli \

    libnl \

    libqsap_sdk \

    libwifi-hal-ctrl \

    libwifi-hal-qcom \

    libwpa_client \

    vendor.qti.hardware.wifi.supplicant@1.0_vendor \

    vendor.qti.hardware.wifi.supplicant@1.0.vendor \

    wificond \

    WifiOverlay \

    libwcnss_qmi \

    wpa_supplicant \

    wpa_supplicant.conf

proprietary-files.txt

+1 −0
Original line number Diff line number Diff line
@@ -862,6 +862,7 @@ vendor/etc/thermal-engine.conf 


# etc-gps-configs

vendor/etc/apdr.conf

vendor/etc/izat.conf

vendor/etc/lowi.conf

vendor/etc/sap.conf

vendor/etc/xtwifi.conf