From 27b21431bd9feb83891c80bce0dd223fcf3c3eb1 Mon Sep 17 00:00:00 2001 From: Nolen Johnson Date: Sun, 9 May 2021 16:25:42 -0400 Subject: [PATCH] exynos9610: Cleanup * Alphabetize all the things. * Cleanup extraneous seperators. * Cleanup extraneous spaces. * Move to double #'s for titles so latter comments indentation makes sense. * Use `comm` and `sort` to compare and ensure we didn't lose anything: `comm -23 <( sort new/BoardConfigCommon.mk) <(sort old/BoardConfigCommon.mk)` Change-Id: If879a307f8e20a2b6b7ad05a76bc32b5a2f4c936 --- BoardConfigCommon.mk | 157 ++++++++++++++++---------------- common.mk | 85 ++++++++--------- proprietary-files-vendor.txt | 172 +++++++++++++++++------------------ proprietary-files.txt | 8 +- system.prop | 35 +++++-- vendor.prop | 125 ++++++++++++++++--------- 6 files changed, 317 insertions(+), 265 deletions(-) diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index f304704..41fc374 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 The LineageOS Project +# Copyright (C) 2020-2021 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,20 +16,13 @@ COMMON_PATH := device/motorola/exynos9610-common -# Soong namespaces -PRODUCT_SOONG_NAMESPACES += $(COMMON_PATH) - -# Include path +## Include path TARGET_SPECIFIC_HEADER_PATH := $(COMMON_PATH)/include -BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := hardware/samsung_slsi/libbt/include - -# Platform -TARGET_BOARD_PLATFORM := exynos9610 -TARGET_SOC := exynos9610 -TARGET_BOOTLOADER_BOARD_NAME := exynos9610 +## Inherit proprietary vendor configuartion +include vendor/motorola/exynos9610-common/BoardConfigVendor.mk -# A/B +## A/B AB_OTA_UPDATER := true AB_OTA_PARTITIONS += \ @@ -39,7 +32,7 @@ AB_OTA_PARTITIONS += \ vbmeta \ vendor -# Architecture +## Architecture TARGET_ARCH := arm64 TARGET_ARCH_VARIANT := armv8-a TARGET_CPU_ABI := arm64-v8a @@ -47,7 +40,7 @@ TARGET_CPU_ABI2 := TARGET_CPU_VARIANT := generic TARGET_CPU_VARIANT_RUNTIME := cortex-a73 -# Secondary Architecture +## Architecture (Secondary) TARGET_2ND_ARCH := arm TARGET_2ND_ARCH_VARIANT := armv8-a TARGET_2ND_CPU_ABI := armeabi-v7a @@ -55,109 +48,117 @@ TARGET_2ND_CPU_ABI2 := armeabi TARGET_2ND_CPU_VARIANT := generic TARGET_2ND_CPU_VARIANT_RUNTIME := cortex-a53 -# Binder +## Audio +USE_XML_AUDIO_POLICY_CONF := 1 + +## Binder TARGET_USES_64_BIT_BINDER := true +## Bluetooth +BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := hardware/samsung_slsi/libbt/include +BOARD_HAVE_BLUETOOTH_SLSI := true + +## Boot Image # Extracted with libbootimg -BOARD_KERNEL_CMDLINE := loop.max_part=7 +BOARD_BOOTIMG_HEADER_VERSION := 1 BOARD_KERNEL_BASE := 0x10000000 +BOARD_KERNEL_CMDLINE := loop.max_part=7 BOARD_KERNEL_OFFSET := 0x00008000 +BOARD_KERNEL_PAGESIZE := 2048 BOARD_RAMDISK_OFFSET := 0x00000000 -BOARD_TAGS_OFFSET := 0x00000000 BOARD_SECOND_OFFSET := 0x00000000 -BOARD_KERNEL_PAGESIZE := 2048 -BOARD_BOOTIMG_HEADER_VERSION := 1 +BOARD_TAGS_OFFSET := 0x00000000 BOARD_MKBOOTIMG_ARGS := --base $(BOARD_KERNEL_BASE) --pagesize $(BOARD_KERNEL_PAGESIZE) --kernel_offset $(BOARD_KERNEL_OFFSET) --second_offset $(BOARD_SECOND_OFFSET) --ramdisk_offset $(BOARD_RAMDISK_OFFSET) --tags_offset $(BOARD_TAGS_OFFSET) --header_version $(BOARD_BOOTIMG_HEADER_VERSION) -BOARD_KERNEL_SEPARATED_DTBO := true -BOARD_DTBO_CFG := $(COMMON_PATH)/configs/dtboimg.cfg +## Bootloader TARGET_BOOTLOADER_IS_2ND := true -# Kernel +## Display +TARGET_SCREEN_DENSITY := 480 + +## DTBO +BOARD_DTBO_CFG := $(COMMON_PATH)/configs/dtboimg.cfg +BOARD_KERNEL_SEPARATED_DTBO := true + +## Filesystem +BOARD_BUILD_SYSTEM_ROOT_IMAGE := true +BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 +TARGET_COPY_OUT_VENDOR := vendor +TARGET_FS_CONFIG_GEN += $(COMMON_PATH)/config.fs +TARGET_USERIMAGES_USE_EXT4 := true +TARGET_USERIMAGES_USE_F2FS := true + +## FM Radio +BOARD_HAVE_SLSI_FM := true + +## Kernel +BOARD_KERNEL_IMAGE_NAME := Image TARGET_KERNEL_ARCH := arm64 TARGET_KERNEL_CLANG_COMPILE := true TARGET_KERNEL_SOURCE := kernel/motorola/exynos9610 -BOARD_KERNEL_IMAGE_NAME := Image -# partitions +## Manifest +DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml + +## Partitions BOARD_BOOTIMAGE_PARTITION_SIZE := 67108864 -BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 -BOARD_VENDORIMAGE_PARTITION_SIZE := 805306368 -BOARD_USERDATAIMAGE_PARTITION_SIZE := 118974455808 BOARD_DTBOIMG_PARTITION_SIZE := 1048576 -BOARD_BUILD_SYSTEM_ROOT_IMAGE := true BOARD_FLASH_BLOCK_SIZE := 131072 # (BOARD_KERNEL_PAGESIZE * 64) +BOARD_SYSTEMIMAGE_PARTITION_SIZE := 3221225472 +BOARD_USERDATAIMAGE_PARTITION_SIZE := 118974455808 BOARD_USES_METADATA_PARTITION := true -BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4 -TARGET_COPY_OUT_VENDOR := vendor +BOARD_VENDORIMAGE_PARTITION_SIZE := 805306368 -# RIL -ENABLE_VENDOR_RIL_SERVICE := true +## Platform +TARGET_BOARD_PLATFORM := exynos9610 +TARGET_BOOTLOADER_BOARD_NAME := exynos9610 +TARGET_SOC := exynos9610 -# Recovery +## Properties +BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true +TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop +TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop + +## Recovery BOARD_USES_RECOVERY_AS_BOOT := true TARGET_NO_RECOVERY := true TARGET_RECOVERY_FSTAB := $(COMMON_PATH)/recovery.fstab TARGET_RECOVERY_PIXEL_FORMAT := "ABGR_8888" -TARGET_USERIMAGES_USE_EXT4 := true -TARGET_USERIMAGES_USE_F2FS := true -# Security +## RIL +ENABLE_VENDOR_RIL_SERVICE := true + +## Security VENDOR_SECURITY_PATCH := 2021-04-01 -# Verified Boot +## SELinux +BOARD_SEPOLICY_TEE_FLAVOR := mobicore +include device/lineage/sepolicy/exynos/sepolicy.mk +include device/samsung_slsi/sepolicy/sepolicy.mk + +BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private +BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor + +## Soong Namespace +PRODUCT_SOONG_NAMESPACES += $(COMMON_PATH) + +## Treble +BOARD_VNDK_VERSION := current + +## Verified Boot BOARD_AVB_ENABLE := true BOARD_AVB_MAKE_VBMETA_IMAGE_ARGS += --flags 3 BOARD_AVB_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP) -# WIFI +## Wi-Fi BOARD_WLAN_DEVICE := slsi -WPA_SUPPLICANT_VERSION := VER_0_8_X BOARD_WPA_SUPPLICANT_DRIVER := NL80211 BOARD_WPA_SUPPLICANT_PRIVATE_LIB := lib_driver_cmd_slsi BOARD_HOSTAPD_DRIVER := NL80211 BOARD_HOSTAPD_PRIVATE_LIB := lib_driver_cmd_slsi WIFI_HIDL_FEATURE_AWARE := true WIFI_HIDL_FEATURE_DUAL_INTERFACE := true - -BOARD_HAVE_BLUETOOTH_SLSI := true +WPA_SUPPLICANT_VERSION := VER_0_8_X PRODUCT_CFI_INCLUDE_PATHS += hardware/samsung_slsi/scsc_wifibt/wpa_supplicant_lib - -# Properties -BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true - -# Treble -BOARD_VNDK_VERSION := current - -# Audio -USE_XML_AUDIO_POLICY_CONF := 1 - -# sepolicy -include device/lineage/sepolicy/exynos/sepolicy.mk - -BOARD_SEPOLICY_TEE_FLAVOR := mobicore -include device/samsung_slsi/sepolicy/sepolicy.mk - -BOARD_PLAT_PRIVATE_SEPOLICY_DIR += $(COMMON_PATH)/sepolicy/private -BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor - -# Properties -TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop -TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop - -# FMRadio -BOARD_HAVE_SLSI_FM := true - -# Filesystem -TARGET_FS_CONFIG_GEN += $(COMMON_PATH)/config.fs - -# Manifest -DEVICE_MANIFEST_FILE := $(COMMON_PATH)/manifest.xml - -# Display -TARGET_SCREEN_DENSITY := 480 - -# Inherit from the proprietary version -include vendor/motorola/exynos9610-common/BoardConfigVendor.mk diff --git a/common.mk b/common.mk index 2b15a72..d3633c8 100644 --- a/common.mk +++ b/common.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2020 The LineageOS Project +# Copyright (C) 2020-2021 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -16,16 +16,9 @@ COMMON_PATH := device/motorola/exynos9610-common -$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_p.mk) - # Get non-open-source specific aspects $(call inherit-product, vendor/motorola/exynos9610-common/exynos9610-common-vendor.mk) -DEVICE_PACKAGE_OVERLAYS += $(COMMON_PATH)/overlay - -# RRO (Runtime Resource Overlay) -PRODUCT_ENFORCE_RRO_TARGETS += * - # A/B AB_OTA_POSTINSTALL_CONFIG += \ RUN_POSTINSTALL_system=true \ @@ -33,6 +26,11 @@ AB_OTA_POSTINSTALL_CONFIG += \ FILESYSTEM_TYPE_system=ext4 \ POSTINSTALL_OPTIONAL_system=true +PRODUCT_PACKAGES += \ + otapreopt_script \ + update_engine \ + update_engine_sideload \ + update_verifier # Audio PRODUCT_PACKAGES += \ @@ -48,6 +46,9 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ frameworks/av/services/audiopolicy/config/a2dp_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/a2dp_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ + frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ + frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml \ $(COMMON_PATH)/configs/audio/aov_ec_mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/aov_ec_mixer_paths.xml \ $(COMMON_PATH)/configs/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ $(COMMON_PATH)/configs/audio/audio_ext_spkr.conf:$(TARGET_COPY_OUT_VENDOR)/etc/audio_ext_spkr.conf \ @@ -55,58 +56,45 @@ PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/audio/audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_configuration.xml \ $(COMMON_PATH)/configs/audio/audio_policy_volumes.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_policy_volumes.xml \ $(COMMON_PATH)/configs/audio/mixer_paths.retin.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.retin.xml \ - $(COMMON_PATH)/configs/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml \ - frameworks/av/services/audiopolicy/config/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \ - frameworks/av/services/audiopolicy/config/r_submix_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/r_submix_audio_policy_configuration.xml \ - frameworks/av/services/audiopolicy/config/usb_audio_policy_configuration.xml:$(TARGET_COPY_OUT_VENDOR)/etc/usb_audio_policy_configuration.xml - -# Update engine -PRODUCT_PACKAGES += \ - update_engine \ - update_engine_sideload \ - update_verifier - -PRODUCT_PACKAGES += \ - otapreopt_script + $(COMMON_PATH)/configs/audio/mixer_paths.xml:$(TARGET_COPY_OUT_VENDOR)/etc/mixer_paths.xml # Bluetooth -PRODUCT_COPY_FILES += \ - hardware/samsung_slsi/libbt/conf/bt_did.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_did.conf - PRODUCT_PACKAGES += \ android.hardware.bluetooth@1.0-impl \ android.hardware.bluetooth@1.0-service \ libbt-vendor -# Boot animation +PRODUCT_COPY_FILES += \ + hardware/samsung_slsi/libbt/conf/bt_did.conf:$(TARGET_COPY_OUT_VENDOR)/etc/bluetooth/bt_did.conf + +# Boot Animation TARGET_SCREEN_HEIGHT := 2520 TARGET_SCREEN_WIDTH := 1080 -# bootctrl +# Boot Control PRODUCT_PACKAGES += \ android.hardware.boot@1.0 \ - android.hardware.boot@1.0-service \ android.hardware.boot@1.0-impl.exynos9610 \ - android.hardware.boot@1.0-impl.exynos9610.recovery + android.hardware.boot@1.0-impl.exynos9610.recovery \ + android.hardware.boot@1.0-service -# camera +# Camera PRODUCT_PACKAGES += \ android.hardware.camera.provider@2.4-impl \ android.hardware.camera.provider@2.4-service \ libsensorndkbridge \ Snap -# configstore +# ConfigStore PRODUCT_PACKAGES += \ android.hardware.configstore@1.1-service - # Display PRODUCT_PACKAGES += \ android.hardware.graphics.allocator@2.0-impl \ android.hardware.graphics.allocator@2.0-service \ android.hardware.graphics.composer@2.2-service \ - android.hardware.graphics.mapper@2.0-impl \ + android.hardware.graphics.mapper@2.0-impl # DRM PRODUCT_PACKAGES += \ @@ -120,10 +108,10 @@ PRODUCT_PACKAGES += \ # Fingerprint Gestures PRODUCT_COPY_FILES += \ - $(COMMON_PATH)/configs/keylayout/uinput-egis.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-egis.kl \ - $(COMMON_PATH)/configs/idc/uinput-egis.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-egis.idc + $(COMMON_PATH)/configs/idc/uinput-egis.idc:$(TARGET_COPY_OUT_VENDOR)/usr/idc/uinput-egis.idc \ + $(COMMON_PATH)/configs/keylayout/uinput-egis.kl:$(TARGET_COPY_OUT_VENDOR)/usr/keylayout/uinput-egis.kl -# FM radio +# FM Radio PRODUCT_PACKAGES += \ FMRadio \ libfmjni @@ -137,7 +125,6 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/gps/gps.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cfg - # Graphics # Device uses high-density artwork where available PRODUCT_AAPT_CONFIG := xlarge @@ -184,10 +171,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ vendor.lineage.livedisplay@2.0-service.exynos9610 -# MotoActions -PRODUCT_PACKAGES += \ - MotoActions - # Media PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/media/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ @@ -205,13 +188,17 @@ PRODUCT_PACKAGES += \ android.hardware.memtrack@1.0-impl \ android.hardware.memtrack@1.0-service +# MotoActions +PRODUCT_PACKAGES += \ + MotoActions + # NFC PRODUCT_PACKAGES += \ + android.hardware.nfc@1.2-service.samsung \ + com.android.nfc_extras \ NfcNci \ - Tag \ SecureElement \ - com.android.nfc_extras \ - android.hardware.nfc@1.2-service.samsung + Tag PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/nfc/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \ @@ -222,6 +209,10 @@ PRODUCT_PACKAGES += \ android.hardware.media.omx@1.0-service \ libstagefright_softomx +# Overlays +DEVICE_PACKAGE_OVERLAYS += $(COMMON_PATH)/overlay +PRODUCT_ENFORCE_RRO_TARGETS += * + # Permissions 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 \ @@ -285,8 +276,7 @@ PRODUCT_PACKAGES += \ android.hardware.radio@1.2 \ android.hardware.radio@1.3 \ android.hardware.radio@1.4 \ - android.hardware.radio.deprecated@1.0 \ - + android.hardware.radio.deprecated@1.0 # RenderScript HAL PRODUCT_PACKAGES += \ @@ -311,10 +301,13 @@ PRODUCT_PACKAGES += \ libmemset \ libdemangle.vendor +# Shipping API +$(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_p.mk) + # Thermal PRODUCT_PACKAGES += \ android.hardware.thermal@1.0-impl \ - android.hardware.thermal@1.0-service \ + android.hardware.thermal@1.0-service PRODUCT_COPY_FILES += \ $(COMMON_PATH)/configs/thermal/exynos-thermal.conf:$(TARGET_COPY_OUT_VENDOR)/exynos-thermal.conf \ diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt index b6cabc4..e4226cd 100644 --- a/proprietary-files-vendor.txt +++ b/proprietary-files-vendor.txt @@ -1,78 +1,6 @@ -# Common proprietary files - from motorola/troika_retail/troika_sprout:10/QSBS30.62-29-11-5/db5cb, unless pinned +## Common proprietary files - from motorola/troika_retail/troika_sprout:10/QSBS30.62-29-11-5/db5cb, unless pinned -# DRM -vendor/lib/liboemcrypto.so - -# DRM - Widevine -vendor/bin/hw/android.hardware.drm@1.2-service.widevine -vendor/etc/init/android.hardware.drm@1.2-service.widevine.rc -vendor/lib/libwvhidl.so - -# GPS -vendor/bin/hw/gpsd -vendor/bin/hw/vendor.samsung.hardware.gnss@1.0-service -vendor/etc/gnss/ca.pem -vendor/etc/init/vendor.samsung.hardware.gnss@1.0-service.rc -vendor/lib64/hw/vendor.samsung.hardware.gnss@1.0-impl.so -vendor/lib64/vendor.samsung.hardware.gnss@1.0.so -vendor/lib64/hw/android.hardware.gnss@1.0-impl.so:vendor/lib64/hw/android.hardware.gnss@1.0-impl.samsung.so -vendor/lib64/hw/android.hardware.gnss@1.1-impl.so:vendor/lib64/hw/android.hardware.gnss@1.1-impl.samsung.so -vendor/lib64/hw/android.hardware.gnss@2.0-impl.so:vendor/lib64/hw/android.hardware.gnss@2.0-impl.samsung.so - -# Gatekeeper -vendor/lib/hw/gatekeeper.exynos9610.so -vendor/lib64/hw/gatekeeper.exynos9610.so - -# IMS -vendor/bin/charon -vendor/lib/libstrongswan.so -vendor/lib/libhydra.so -vendor/lib/libcharon.so - -# Memtrack -vendor/lib/hw/memtrack.exynos9610.so -vendor/lib64/hw/memtrack.exynos9610.so - -# NFC -vendor/etc/sec_s3nrn82_rfreg.bin - -# OMX -vendor/lib/libExynosOMX_Core.so -vendor/lib/libExynosOMX_Resourcemanager.so -vendor/lib/libstagefrighthw.so -vendor/lib/omx/libOMX.Exynos.AVC.Decoder.so -vendor/lib/omx/libOMX.Exynos.AVC.Encoder.so -vendor/lib/omx/libOMX.Exynos.HEVC.Decoder.so -vendor/lib/omx/libOMX.Exynos.HEVC.Encoder.so -vendor/lib/omx/libOMX.Exynos.MPEG4.Decoder.so -vendor/lib/omx/libOMX.Exynos.MPEG4.Encoder.so -vendor/lib/omx/libOMX.Exynos.VP8.Decoder.so -vendor/lib/omx/libOMX.Exynos.VP8.Encoder.so -vendor/lib/omx/libOMX.Exynos.VP9.Decoder.so -vendor/lib/omx/libOMX.Exynos.VP9.Encoder.so -vendor/lib/omx/libOMX.Exynos.WMV.Decoder.so -vendor/lib64/libExynosOMX_Core.so -vendor/lib64/libExynosOMX_Resourcemanager.so -vendor/lib64/libstagefrighthw.so -vendor/lib64/omx/libOMX.Exynos.AVC.Decoder.so -vendor/lib64/omx/libOMX.Exynos.AVC.Encoder.so -vendor/lib64/omx/libOMX.Exynos.HEVC.Decoder.so -vendor/lib64/omx/libOMX.Exynos.HEVC.Encoder.so -vendor/lib64/omx/libOMX.Exynos.MPEG4.Decoder.so -vendor/lib64/omx/libOMX.Exynos.MPEG4.Encoder.so -vendor/lib64/omx/libOMX.Exynos.VP8.Decoder.so -vendor/lib64/omx/libOMX.Exynos.VP8.Encoder.so -vendor/lib64/omx/libOMX.Exynos.VP9.Decoder.so -vendor/lib64/omx/libOMX.Exynos.VP9.Encoder.so -vendor/lib64/omx/libOMX.Exynos.WMV.Decoder.so - -# Sensors -vendor/lib/libhubconnection.so -vendor/lib/sensors.rp.so -vendor/lib64/libhubconnection.so -vendor/lib64/sensors.rp.so - -# audio +## Audio vendor/bin/main_abox vendor/etc/ap_gain_mmul.bin vendor/etc/dolby/dax-default.xml @@ -84,7 +12,7 @@ vendor/lib/libmotaudioutils.so vendor/lib/libunshorten.so vendor/lib64/libdapparamstorage.so -# camera +## Camera vendor/lib/libENF.so vendor/lib/libexynoscamera_hifi_plugin.so vendor/lib/libexynoscamera_hifills_plugin.so @@ -108,10 +36,18 @@ vendor/lib64/libhwjpeg.so vendor/lib64/libvdis.so vendor/lib64/libyuvrepro.so -# charger +## Charger vendor/bin/charge_only_mode -# fingerprint +## DRM +vendor/lib/liboemcrypto.so + +## DRM - Widevine +vendor/bin/hw/android.hardware.drm@1.2-service.widevine +vendor/etc/init/android.hardware.drm@1.2-service.widevine.rc +vendor/lib/libwvhidl.so + +## Fingerprint vendor/bin/hw/android.hardware.biometrics.fingerprint@2.1-service-rbs vendor/etc/init/android.hardware.biometrics.fingerprint@2.1-service-rbs.rc vendor/lib/hw/vendor.egistec.hardware.fingerprint@4.0-impl.so @@ -120,7 +56,7 @@ vendor/lib64/hw/vendor.egistec.hardware.fingerprint@4.0-impl.so vendor/lib64/libRbsFlow.so vendor/lib64/vendor.egistec.hardware.fingerprint@4.0.so -# firmware +## Firmware vendor/firmware/AP_AUDIO_SLSI.bin vendor/firmware/CC_DRAM_CODE_FLASH.bin vendor/firmware/CC_DRAM_CODE_FLASH_HIFI.bin @@ -177,7 +113,22 @@ vendor/firmware/sec_s3nrn81_firmware.bin vendor/firmware/sec_s3nrn82_firmware.bin vendor/firmware/tracker_cfg.json -# graphics +## Gatekeeper +vendor/lib/hw/gatekeeper.exynos9610.so +vendor/lib64/hw/gatekeeper.exynos9610.so + +## GPS +vendor/bin/hw/gpsd +vendor/bin/hw/vendor.samsung.hardware.gnss@1.0-service +vendor/etc/gnss/ca.pem +vendor/etc/init/vendor.samsung.hardware.gnss@1.0-service.rc +vendor/lib64/hw/vendor.samsung.hardware.gnss@1.0-impl.so +vendor/lib64/vendor.samsung.hardware.gnss@1.0.so +vendor/lib64/hw/android.hardware.gnss@1.0-impl.so:vendor/lib64/hw/android.hardware.gnss@1.0-impl.samsung.so +vendor/lib64/hw/android.hardware.gnss@1.1-impl.so:vendor/lib64/hw/android.hardware.gnss@1.1-impl.samsung.so +vendor/lib64/hw/android.hardware.gnss@2.0-impl.so:vendor/lib64/hw/android.hardware.gnss@2.0-impl.samsung.so + +## Graphics vendor/lib/egl/libGLES_mali.so vendor/lib/hw/gralloc.exynos9610.so vendor/lib/hw/hwcomposer.exynos9610.so @@ -208,11 +159,21 @@ vendor/lib64/libexynosv4l2.so vendor/lib64/libion_exynos.so vendor/lib64/libmpp.so -# keymaster +## Keymaster vendor/lib/hw/keystore.exynos9610.so vendor/lib64/hw/keystore.exynos9610.so -# mobicore +## IMS +vendor/bin/charon +vendor/lib/libstrongswan.so +vendor/lib/libhydra.so +vendor/lib/libcharon.so + +## Memtrack +vendor/lib/hw/memtrack.exynos9610.so +vendor/lib64/hw/memtrack.exynos9610.so + +## Mobicore vendor/app/mcRegistry/00060308060501020000000000000000.tlbin vendor/app/mcRegistry/07010000000000000000000000000000.tlbin vendor/app/mcRegistry/0706000000000000000000000000004d.tlbin @@ -225,11 +186,44 @@ vendor/bin/mcDriverDaemon vendor/lib/libMcClient.so vendor/lib64/libMcClient.so -# power +## NFC +vendor/etc/sec_s3nrn82_rfreg.bin + +## OMX +vendor/lib/libExynosOMX_Core.so +vendor/lib/libExynosOMX_Resourcemanager.so +vendor/lib/libstagefrighthw.so +vendor/lib/omx/libOMX.Exynos.AVC.Decoder.so +vendor/lib/omx/libOMX.Exynos.AVC.Encoder.so +vendor/lib/omx/libOMX.Exynos.HEVC.Decoder.so +vendor/lib/omx/libOMX.Exynos.HEVC.Encoder.so +vendor/lib/omx/libOMX.Exynos.MPEG4.Decoder.so +vendor/lib/omx/libOMX.Exynos.MPEG4.Encoder.so +vendor/lib/omx/libOMX.Exynos.VP8.Decoder.so +vendor/lib/omx/libOMX.Exynos.VP8.Encoder.so +vendor/lib/omx/libOMX.Exynos.VP9.Decoder.so +vendor/lib/omx/libOMX.Exynos.VP9.Encoder.so +vendor/lib/omx/libOMX.Exynos.WMV.Decoder.so +vendor/lib64/libExynosOMX_Core.so +vendor/lib64/libExynosOMX_Resourcemanager.so +vendor/lib64/libstagefrighthw.so +vendor/lib64/omx/libOMX.Exynos.AVC.Decoder.so +vendor/lib64/omx/libOMX.Exynos.AVC.Encoder.so +vendor/lib64/omx/libOMX.Exynos.HEVC.Decoder.so +vendor/lib64/omx/libOMX.Exynos.HEVC.Encoder.so +vendor/lib64/omx/libOMX.Exynos.MPEG4.Decoder.so +vendor/lib64/omx/libOMX.Exynos.MPEG4.Encoder.so +vendor/lib64/omx/libOMX.Exynos.VP8.Decoder.so +vendor/lib64/omx/libOMX.Exynos.VP8.Encoder.so +vendor/lib64/omx/libOMX.Exynos.VP9.Decoder.so +vendor/lib64/omx/libOMX.Exynos.VP9.Encoder.so +vendor/lib64/omx/libOMX.Exynos.WMV.Decoder.so + +## Power vendor/lib/hw/power.exynos9610.so vendor/lib64/hw/power.exynos9610.so -# ril +## RIL vendor/bin/cbd vendor/bin/hw/rild_exynos vendor/etc/database/EccTable_202.xml @@ -318,16 +312,22 @@ vendor/lib64/vendor.samsung_slsi.telephony.hardware.radio@1.0.so vendor/lib64/vendor.samsung_slsi.telephony.hardware.radio@1.1.so vendor/lib64/vendor.samsung_slsi.telephony.hardware.radioExternal@1.0.so -# secure element +## Secure Element vendor/bin/hw/android.hardware.secure_element@1.1-service-uicc vendor/etc/init/android.hardware.secure_element@1.1-service-uicc.rc -# thermal +## Sensors +vendor/lib/libhubconnection.so +vendor/lib/sensors.rp.so +vendor/lib64/libhubconnection.so +vendor/lib64/sensors.rp.so + +## Thermal vendor/bin/exynos-thermald vendor/lib/hw/thermal.exynos9610.so vendor/lib64/hw/thermal.exynos9610.so -# wifi +## Wi-Fi vendor/etc/wifi/mx vendor/etc/wifi/mx140.bin vendor/etc/wifi/mx140/conf/leman_s620_flexi/bluetooth/bt.hcf diff --git a/proprietary-files.txt b/proprietary-files.txt index d2a3710..6f9ebbe 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -1,15 +1,15 @@ -# Common proprietary files - from motorola/troika_retail/troika_sprout:10/QSBS30.62-29-11-5/db5cb, unless pinned +## Common proprietary files - from motorola/troika_retail/troika_sprout:10/QSBS30.62-29-11-5/db5cb, unless pinned -# Bluetooth (aptX) +## Bluetooth (aptX) lib64/libaptXHD_encoder.so lib64/libaptX_encoder.so -# HotwordEnrollment +## HotwordEnrollment -priv-app/HotwordEnrollmentOKGoogleCS47L35/HotwordEnrollmentOKGoogleCS47L35.apk -priv-app/HotwordEnrollmentTGoogleCS47L35/HotwordEnrollmentTGoogleCS47L35.apk -priv-app/HotwordEnrollmentXGoogleCS47L35/HotwordEnrollmentXGoogleCS47L35.apk -# IMS +## IMS # ShannonIms.apk is modified to include IEPdgConnection* classes from stock's framework.jar # and removed libmediaadaptor dependency -app/ShannonIms/ShannonIms.apk|6be75e9e3ccae883c17265927646d9c508ae44b0 diff --git a/system.prop b/system.prop index 64086df..3c85ba5 100644 --- a/system.prop +++ b/system.prop @@ -1,14 +1,33 @@ +## Audio +persist.audio.endcall.delay=250 +persist.sys.bootanim.play_sound=true + +## CSC +ro.vendor.cscsupported=1 + +## Display +ro.surface_flinger.use_color_management=1 + +## Encryption +ro.crypto.allow_encrypt_override=false +ro.crypto.volume.filenames_mode=aes-256-cts + +## Media +media.settings.xml=/vendor/etc/media_profiles_vendor.xml + +## Rotation persist.demo.hdmirotationlock=false + +## Navigation Bar qemu.hw.mainkeys=0 -persist.sys.bootanim.play_sound=true + +## Net init.svc.vendor.pktrouter=1 -ro.vendor.cscsupported=1 + +## RIL ril.ecclist=911,112 ril.ecclist1=911,112 -ro.crypto.volume.filenames_mode=aes-256-cts -ro.crypto.allow_encrypt_override=true -ro.surface_flinger.use_color_management=1 -media.settings.xml=/vendor/etc/media_profiles_vendor.xml -persist.audio.endcall.delay=250 -wifi.direct.interface=p2p0 + +## Wi-Fi ro.boot.wificountrycode=00 +wifi.direct.interface=p2p0 diff --git a/vendor.prop b/vendor.prop index f472cae..c903a4d 100644 --- a/vendor.prop +++ b/vendor.prop @@ -1,61 +1,100 @@ -ro.hardware.soc.manufacturer=slsi -ro.mot.android_one=true +## Audio +aaudio.hw_burst_min_usec=2000 +aaudio.mmap_exclusive_policy=1 +aaudio.mmap_policy=1 +persist.vendor.audio.endcall.delay=250 +ro.config.alarm_alert=Oxygen.ogg +ro.config.notification_sound=Moto.ogg ro.config.ringtone=Moto.ogg ro.config.ringtone_2=Moto.ogg -ro.config.notification_sound=Moto.ogg -ro.config.alarm_alert=Oxygen.ogg -persist.vendor.audio.endcall.delay=250 ro.config.vc_call_vol_steps=8 -dev.usbsetting.embedded=on -ro.vendor.config.release_version=20190525 -persist.vendor.ril.emergencynumber.sim=1 -aaudio.mmap_policy=1 -aaudio.mmap_exclusive_policy=1 -aaudio.hw_burst_min_usec=2000 -ro.control_privapp_permissions=enforce -wifi.interface=wlan0 -ro.opengles.version=196610 -debug.slsi_platform=1 -debug.hwc.winupdate=1 -debug.sf.disable_backpressure=1 ro.vendor.ddk.set.afbc=1 -dalvik.vm.heapstartsize=8m + +## Camera +persist.vendor.camera.expose.aux=1 +vendor.camera.aux.packagelist=com.motorola.camera2,com.motorola.motocit,com.motorola.actions,org.lineageos.snap +vendor.camera.aux.packagelist2=com.motorola.ccc,com.android.settings + +## Dalvik +dalvik.vm.dex2oat-threads=6 dalvik.vm.heapgrowthlimit=192m +dalvik.vm.heapmaxfree=8m +dalvik.vm.heapminfree=512k +dalvik.vm.heapstartsize=8m dalvik.vm.heapsize=512m dalvik.vm.heaptargetutilization=0.75 -dalvik.vm.heapminfree=512k -dalvik.vm.heapmaxfree=8m +ro.cp_system_other_odex=1 + +## Display +persist.sys.sf.native_mode=1 + +## DRM +drm.service.enabled=true + +# Encryption +ro.crypto.allow_encrypt_override=false +ro.crypto.volume.filenames_mode=aes-256-cts + +## FRP ro.frp.pst=/dev/block/platform/13520000.ufs/by-name/frp -keyguard.no_require_sim=true -ro.carrier=europen -ro.vendor.config.build_carrier=europen + +## Graphics +debug.hwc.winupdate=1 +debug.sf.disable_backpressure=1 +ro.opengles.version=196610 + +## IMS +persist.vendor.lte.pco_supported=true +persist.dbg.volte_avail_ovr=1 +persist.dbg.wfc_avail_ovr=1 persist.vendor.radio.dual.volte=1 -ro.ril.ecclist=911,112 ro.telephony.iwlan_operation_mode=legacy -vendor.radio.smsdomain=2 -vendor.rild.libpath=libsitril.so + +## Keyguard +keyguard.no_require_sim=true + +## Logging persist.vendor.wlbtlog.maxfilesize=50 persist.vendor.wlbtlog.maxfiles=5 +ro.debug_level=0x494d +ro.logd.size=2M + +## Media +media.settings.xml=/vendor/etc/media_profiles_vendor_V1.xml + +## Navigation Bar +qemu.hw.mainkeys=0 + +## OEM Unlock ro.oem_unlock_supported=1 -persist.vendor.ril.crash_handling_mode=2 -ro.crypto.volume.filenames_mode=aes-256-cts -ro.crypto.allow_encrypt_override=false + +## Platform +debug.slsi_platform=1 +ro.hardware.soc.manufacturer=slsi +ro.mot.android_one=true +ro.vendor.config.release_version=20190525 + +## Privapp Permissions +ro.control_privapp_permissions=enforce + +## Radio persist.radio.multisim.config=dsds -ro.logd.size=2M +persist.vendor.ril.crash_handling_mode=2 +persist.vendor.ril.emergencynumber.sim=1 radio.smsdomain=0 +ro.carrier=europen +ro.ril.ecclist=911,112 +ro.vendor.config.build_carrier=europen telephony.lteOnCdmaDevice=1 -ro.debug_level=0x494d +vendor.radio.smsdomain=2 +vendor.rild.libpath=libsitril.so vendor.sys.exynos.modempath=/dev/block/platform/13520000.ufs/by-name/modem -qemu.hw.mainkeys=0 -ro.cp_system_other_odex=1 -persist.sys.sf.native_mode=1 -persist.vendor.camera.expose.aux=1 -vendor.camera.aux.packagelist=com.motorola.camera2,com.motorola.motocit,com.motorola.actions,org.lineageos.snap -vendor.camera.aux.packagelist2=com.motorola.ccc,com.android.settings -dalvik.vm.dex2oat-threads=6 + +## Sensors ro.vendor.sensors.mot_ltv=true -drm.service.enabled=true -media.settings.xml=/vendor/etc/media_profiles_vendor_V1.xml -persist.vendor.lte.pco_supported=true -persist.dbg.volte_avail_ovr=1 -persist.dbg.wfc_avail_ovr=1 + +## USB +dev.usbsetting.embedded=on + +## Wi-Fi +wifi.interface=wlan0 -- 2.20.1