diff --git a/configs/ld.config.txt b/configs/ld.config.txt deleted file mode 100644 index 45d4e89..0000000 --- a/configs/ld.config.txt +++ /dev/null @@ -1,133 +0,0 @@ -# Copyright (C) 2019 The Android Open Source Project -# -# Bionic loader config file for the media swcodec APEX. -# -# There are no versioned APEX paths here - this APEX module does not support -# having several versions mounted. - -dir.swcodec = /apex/com.android.media.swcodec/bin/ - -[swcodec] -additional.namespaces = platform,sphal - -############################################################################### -# "default" namespace -# -# This namespace is for the binaries and libraries on the swcodec APEX. -############################################################################### - -namespace.default.isolated = true -namespace.default.visible = true - -namespace.default.search.paths = /apex/com.android.media.swcodec/${LIB} -namespace.default.asan.search.paths = /apex/com.android.media.swcodec/${LIB} - -namespace.default.links = platform - -# TODO: replace the following when apex has a way to auto-generate this list -# namespace.default.link.platform.shared_libs = %LLNDK_LIBRARIES% -# namespace.default.link.platform.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% -namespace.default.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libdl_android.so:libvulkan.so:libashmemd_client.so - -############################################################################### -# "platform" namespace -# -# This namespace is for linking to LLNDK and ASAN libraries on the system. -############################################################################### - -namespace.platform.isolated = true - -namespace.platform.search.paths = /system/${LIB} -namespace.platform.search.paths += /apex/com.android.runtime/${LIB} -namespace.platform.asan.search.paths = /data/asan/system/${LIB} -namespace.platform.asan.search.paths += /system/${LIB} -namespace.platform.asan.search.paths += /apex/com.android.runtime/${LIB} - -# /system/lib/libc.so, etc are symlinks to /apex/com.android.lib/lib/bionic/libc.so, etc. -# Add /apex/... pat to the permitted paths because linker uses realpath(3) -# to check the accessibility of the lib. We could add this to search.paths -# instead but that makes the resolution of bionic libs be dependent on -# the order of /system/lib and /apex/... in search.paths. If /apex/... -# is after /system/lib, then /apex/... is never tried because libc.so -# is always found in /system/lib but fails to pass the accessibility test -# because of its realpath. It's better to not depend on the ordering if -# possible. -namespace.platform.permitted.paths = /apex/com.android.runtime/${LIB}/bionic -namespace.platform.asan.permitted.paths = /apex/com.android.runtime/${LIB}/bionic - -############################################################################### -# "sphal" namespace -# -############################################################################### -namespace.sphal.isolated = true -namespace.sphal.visible = true - -# Keep the below in sync with "sphal" namespace in system's /etc/ld.config.txt -# Codec2 has dependencies on some SP-hals (eg. android.hardware.graphics.mapper@2.0) -# These are dlopen'ed by libvndksupport.so. -namespace.sphal.search.paths = /odm/${LIB} -namespace.sphal.search.paths += /vendor/${LIB} - -namespace.sphal.permitted.paths = /odm/${LIB} -namespace.sphal.permitted.paths += /vendor/${LIB} -namespace.sphal.permitted.paths += /vendor/${LIB}/hw -namespace.sphal.permitted.paths += /system/vendor/${LIB} - -namespace.sphal.asan.search.paths = /data/asan/odm/${LIB} -namespace.sphal.asan.search.paths += /odm/${LIB} -namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB} -namespace.sphal.asan.search.paths += /vendor/${LIB} - -namespace.sphal.asan.permitted.paths = /data/asan/odm/${LIB} -namespace.sphal.asan.permitted.paths += /odm/${LIB} -namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB} -namespace.sphal.asan.permitted.paths += /vendor/${LIB} - -# Keep the below in sync with "vndk" namespace in system's /etc/ld.config.txt -# System's sphal namespace links to vndk namespace for %VNDK_SAMEPROCESS_LIBRARIES%, -# since we don't have a good way to auto-expand %VNDK_SAMEPROCESS_LIBRARIES%, -# we'll add the vndk paths below. - -namespace.sphal.search.paths += /odm/${LIB}/vndk-sp -namespace.sphal.search.paths += /vendor/${LIB}/vndk-sp -namespace.sphal.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} - -namespace.sphal.permitted.paths += /odm/${LIB}/hw -namespace.sphal.permitted.paths += /odm/${LIB}/egl -namespace.sphal.permitted.paths += /vendor/${LIB}/hw -namespace.sphal.permitted.paths += /vendor/${LIB}/egl -namespace.sphal.permitted.paths += /system/vendor/${LIB}/hw -namespace.sphal.permitted.paths += /system/vendor/${LIB}/egl -# This is exceptionally required since android.hidl.memory@1.0-impl.so is here -namespace.sphal.permitted.paths += /system/${LIB}/vndk-sp${VNDK_VER}/hw - -namespace.sphal.asan.search.paths += /data/asan/odm/${LIB}/vndk-sp -namespace.sphal.asan.search.paths += /odm/${LIB}/vndk-sp -namespace.sphal.asan.search.paths += /data/asan/vendor/${LIB}/vndk-sp -namespace.sphal.asan.search.paths += /vendor/${LIB}/vndk-sp -namespace.sphal.asan.search.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VER} -namespace.sphal.asan.search.paths += /system/${LIB}/vndk-sp${VNDK_VER} - -namespace.sphal.asan.permitted.paths += /data/asan/odm/${LIB}/hw -namespace.sphal.asan.permitted.paths += /odm/${LIB}/hw -namespace.sphal.asan.permitted.paths += /data/asan/odm/${LIB}/egl -namespace.sphal.asan.permitted.paths += /odm/${LIB}/egl -namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}/hw -namespace.sphal.asan.permitted.paths += /vendor/${LIB}/hw -namespace.sphal.asan.permitted.paths += /data/asan/vendor/${LIB}/egl -namespace.sphal.asan.permitted.paths += /vendor/${LIB}/egl - -namespace.sphal.asan.permitted.paths += /data/asan/system/${LIB}/vndk-sp${VNDK_VER}/hw -namespace.sphal.asan.permitted.paths += /system/${LIB}/vndk-sp${VNDK_VER}/hw - -# Once in this namespace, access to libraries in /system/lib is restricted. Only -# libs listed here can be used. -namespace.sphal.links = platform - -# TODO: replace the following when apex has a way to auto-generate this list -# namespace.sphal.link.platform.shared_libs = %LLNDK_LIBRARIES% -# namespace.sphal.link.platform.shared_libs += %SANITIZER_RUNTIME_LIBRARIES% -namespace.sphal.link.platform.shared_libs = libEGL.so:libGLESv1_CM.so:libGLESv2.so:libGLESv3.so:libRS.so:libandroid_net.so:libc.so:libcgrouprc.so:libclang_rt.asan-aarch64-android.so:libclang_rt.asan-arm-android.so:libclang_rt.hwasan-aarch64-android.so:libclang_rt.asan-i686-android.so:libclang_rt.asan-x86_64-android.so:libdl.so:libft2.so:liblog.so:libm.so:libmediandk.so:libnativewindow.so:libneuralnetworks.so:libsync.so:libvndksupport.so:libvulkan.so - -# Add a link for libz.so which is llndk on devices where VNDK is not enforced. -namespace.sphal.link.platform.shared_libs += libz.so diff --git a/configs/privapp-permissions-oem.xml b/configs/privapp-permissions-oem.xml index 9beb352..a9bd5a1 100644 --- a/configs/privapp-permissions-oem.xml +++ b/configs/privapp-permissions-oem.xml @@ -31,30 +31,6 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -89,4 +65,10 @@ + + + + + + diff --git a/device.mk b/device.mk index 6fd747e..20c0aa4 100644 --- a/device.mk +++ b/device.mk @@ -16,6 +16,8 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/languages_full.mk) +PRODUCT_ENFORCE_RRO_TARGETS := frameworks-res + # Vendor properties -include device/motorola/sanders/vendor_prop.mk @@ -58,36 +60,29 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/com.android.nfc_extras.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.android.nfc_extras.xml \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml -# APEX -PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/ld.config.txt:$(TARGET_COPY_OUT_SYSTEM)/etc/swcodec/ld.config.txt - # Screen density PRODUCT_AAPT_PREF_CONFIG := xxhdpi PRODUCT_AAPT_CONFIG := normal # Audio PRODUCT_PACKAGES += \ - audiod \ + android.hardware.audio@4.0-impl \ + android.hardware.audio.effect@4.0-impl \ + android.hardware.audio@2.0-service \ + android.hardware.broadcastradio@1.0-impl \ audio.primary.msm8953 \ audio.a2dp.default \ - audio.r_submix.default \ audio.usb.default \ + audio.r_submix.default \ libaacwrapper \ libaudio-resampler \ - libtinycompress - -PRODUCT_PACKAGES += \ + libshim_adsp \ + libtinycompress \ + audiod \ libqcomvisualizer \ libqcomvoiceprocessing \ libqcomvoiceprocessingdescriptors -PRODUCT_PACKAGES += \ - android.hardware.audio@4.0-impl \ - android.hardware.audio@2.0-service \ - android.hardware.audio.effect@4.0-impl \ - android.hardware.broadcastradio@1.0-impl - PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/audio/audio_effects.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_effects.xml \ $(LOCAL_PATH)/audio/audio_platform_info.xml:$(TARGET_COPY_OUT_VENDOR)/etc/audio_platform_info.xml \ @@ -152,10 +147,11 @@ PRODUCT_PACKAGES += \ libgenlock \ libtinyxml \ libdisplayconfig \ - libqdMetaData.system \ - vendor.display.config@1.0 + libqdMetaData.system -PRODUCT_PACKAGES += android.hardware.media.omx +PRODUCT_PACKAGES += \ + vendor.display.color@1.0-service \ + vendor.display.color@1.0-impl # DRM PRODUCT_PACKAGES += \ @@ -204,7 +200,7 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/gps/etc/sap.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sap.conf \ $(LOCAL_PATH)/gps/etc/xtwifi.conf:$(TARGET_COPY_OUT_VENDOR)/etc/xtwifi.conf -# health +# Health PRODUCT_PACKAGES += \ android.hardware.health@2.0-impl \ android.hardware.health@2.0-service @@ -253,9 +249,22 @@ PRODUCT_PACKAGES += \ android.hardware.light@2.0-impl \ android.hardware.light@2.0-service.sanders -# Media +# Media (OMX) PRODUCT_PACKAGES += \ - libc2dcolorconvert + libc2dcolorconvert \ + android.hardware.media.omx \ + libextmedia_jni \ + libmm-omxcore \ + libOmxAacEnc \ + libOmxAmrEnc \ + libOmxCore \ + libOmxEvrcEnc \ + libOmxG711Enc \ + libOmxQcelp13Enc \ + libOmxVdec \ + libOmxVenc \ + libOmxVidcCommon \ + libstagefrighthw PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \ @@ -300,18 +309,6 @@ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/libnfc-nci.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nci.conf \ $(LOCAL_PATH)/configs/libnfc-nxp.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-nxp.conf -# OMX -PRODUCT_PACKAGES += \ - libOmxAacEnc \ - libOmxAmrEnc \ - libOmxCore \ - libOmxEvrcEnc \ - libOmxQcelp13Enc \ - libOmxVdec \ - libOmxVenc \ - libOmxVidcCommon \ - libstagefrighthw - # Overlay DEVICE_PACKAGE_OVERLAYS += \ $(LOCAL_PATH)/overlay \ @@ -319,39 +316,36 @@ DEVICE_PACKAGE_OVERLAYS += \ # Perf configs PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/perf/commonresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonresourceconfigs.xml \ - $(LOCAL_PATH)/configs/perf/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml \ - $(LOCAL_PATH)/configs/perf/targetconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetconfig.xml \ - $(LOCAL_PATH)/configs/perf/targetresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetresourceconfigs.xml + $(LOCAL_PATH)/configs/perf/commonresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonresourceconfigs.xml \ + $(LOCAL_PATH)/configs/perf/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml \ + $(LOCAL_PATH)/configs/perf/targetconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetconfig.xml \ + $(LOCAL_PATH)/configs/perf/targetresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetresourceconfigs.xml PRODUCT_ENFORCE_RRO_TARGETS := \ framework-res # Perf configs PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/perf/commonresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonresourceconfigs.xml \ - $(LOCAL_PATH)/configs/perf/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml \ - $(LOCAL_PATH)/configs/perf/targetconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetconfig.xml \ - $(LOCAL_PATH)/configs/perf/targetresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetresourceconfigs.xml + $(LOCAL_PATH)/configs/perf/commonresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/commonresourceconfigs.xml \ + $(LOCAL_PATH)/configs/perf/perfboostsconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/perfboostsconfig.xml \ + $(LOCAL_PATH)/configs/perf/targetconfig.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetconfig.xml \ + $(LOCAL_PATH)/configs/perf/targetresourceconfigs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/perf/targetresourceconfigs.xml # Power PRODUCT_PACKAGES += \ - android.hardware.power@1.2-service-qti + android.hardware.power@1.2-service \ # Powerhint configuration file PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/configs/powerhint.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/powerhint.xml + $(LOCAL_PATH)/configs/powerhint.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/powerhint.xml # Qualcomm PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/privapp-permissions-oem.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/privapp-permissions-oem.xml \ $(LOCAL_PATH)/configs/qti_whitelist.xml:$(TARGET_COPY_OUT_VENDOR)/etc/sysconfig/qti_whitelist.xml -PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ - ro.vendor.qti.va_aosp.support=1 - -PRODUCT_ODM_PROPERTIES += \ - ro.vendor.qti.va_odm.support=1 +PRODUCT_PACKAGES += \ + libqti_vndfwk_detect # Ramdisk PRODUCT_PACKAGES += \ @@ -373,7 +367,7 @@ PRODUCT_PACKAGES += \ init.dtv.sh PRODUCT_COPY_FILES += \ - $(LOCAL_PATH)/rootdir/etc/ueventd.qcom.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc + $(LOCAL_PATH)/rootdir/etc/ueventd.qcom.rc:$(TARGET_COPY_OUT_VENDOR)/ueventd.rc # RCS PRODUCT_PACKAGES += \ @@ -503,10 +497,4 @@ PRODUCT_COPY_FILES += \ #PRODUCT_BOOT_JARS += \ # WfdCommon -# CarrierConfig -PRODUCT_PACKAGES += \ - CarrierConfig - -PRODUCT_BUILD_PROP_OVERRIDES += BUILD_UTC_DATE=0 - PRODUCT_GMS_CLIENTID_BASE := android-motorola diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml index 1117aa6..a362eff 100644 --- a/overlay/frameworks/base/core/res/res/values/config.xml +++ b/overlay/frameworks/base/core/res/res/values/config.xml @@ -226,9 +226,6 @@ autodetected from the Configuration. --> true - - true - diff --git a/overlay/packages/apps/FMRadio/res/values/config.xml b/overlay/packages/apps/FMRadio/res/values/config.xml deleted file mode 100644 index 3751147..0000000 --- a/overlay/packages/apps/FMRadio/res/values/config.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - true - - diff --git a/overlay/packages/apps/Settings/res/values/bools.xml b/overlay/packages/apps/Settings/res/values/bools.xml index 962196f..a97825a 100644 --- a/overlay/packages/apps/Settings/res/values/bools.xml +++ b/overlay/packages/apps/Settings/res/values/bools.xml @@ -12,10 +12,6 @@ limitations under the License. --> - - - true - true diff --git a/rootdir/etc/init.qcom.rc b/rootdir/etc/init.qcom.rc index 49e7560..b84d006 100644 --- a/rootdir/etc/init.qcom.rc +++ b/rootdir/etc/init.qcom.rc @@ -1012,5 +1012,3 @@ on property:sys.boot_completed=1 on property:sys.boot_completed=1 setprop vendor.post_boot.parsed 1 -on property:apexd.status=ready - mount none /system/etc/swcodec/ld.config.txt /apex/com.android.media.swcodec/etc/ld.config.txt bind diff --git a/vendor_prop.mk b/vendor_prop.mk index 59c4a65..f6d987c 100644 --- a/vendor_prop.mk +++ b/vendor_prop.mk @@ -221,7 +221,6 @@ PRODUCT_PROPERTY_OVERRIDES += \ persist.cne.feature=1 \ persist.radio.add_power_save=1 - # NITZ PRODUCT_PROPERTY_OVERRIDES += \ persist.rild.nitz_plmn="" \ @@ -251,6 +250,12 @@ PRODUCT_PROPERTY_OVERRIDES += \ debug.qc.hardware=true \ persist.timed.enable=true +PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \ + ro.vendor.qti.va_aosp.support=1 + +PRODUCT_ODM_PROPERTIES += \ + ro.vendor.qti.va_odm.support=1 + # Radio PRODUCT_PROPERTY_OVERRIDES += \ persist.data.qmi.adb_logmask=0 \ @@ -375,33 +380,24 @@ PRODUCT_PROPERTY_OVERRIDES += \ # Volte PRODUCT_PROPERTY_OVERRIDES += \ -persist.vendor.radio.force_on_dc=true \ -persist.radio.custom_ecc=1 \ -persist.radio.data_con_rprt=1 \ -persist.vendor.radio.data_ltd_sys_ind=1 \ -persist.radio.data_ltd_sys_ind=1 \ -persist.vendor.radio.ignore_dom_time=10 \ -persist.radio.ignore_dom_time=10 \ -persist.radio.rat_on=combine \ -persist.radio.is_wps_enabled=true \ -persist.radio.videopause.mode=1 \ -persist.radio.sap_silent_pin=1 \ -persist.radio.always_send_plmn=true \ -persist.rcs.supported=1 \ -persist.dbg.ims_volte_enable=1 \ -persist.dbg.volte_avail_ovr=1 \ -persist.dbg.vt_avail_ovr=1 \ -persist.dbg.wfc_avail_ovr=1 \ -persist.radio.data_lte_sys_ind=1 - -# Spectrum -PRODUCT_PROPERTY_OVERRIDES += \ - spectrum.support=1 \ - persist.spectrum.kernel=MAYHEM-Parallax - -# Create Swap disk, if below sys-prop enabled & also if device has lower (< 1 GB) RAM -PRODUCT_PROPERTY_OVERRIDES += \ -ro.config.swap=true + persist.vendor.radio.force_on_dc=true \ + persist.radio.custom_ecc=1 \ + persist.radio.data_con_rprt=1 \ + persist.vendor.radio.data_ltd_sys_ind=1 \ + persist.radio.data_ltd_sys_ind=1 \ + persist.vendor.radio.ignore_dom_time=10 \ + persist.radio.ignore_dom_time=10 \ + persist.radio.rat_on=combine \ + persist.radio.is_wps_enabled=true \ + persist.radio.videopause.mode=1 \ + persist.radio.sap_silent_pin=1 \ + persist.radio.always_send_plmn=true \ + persist.rcs.supported=1 \ + persist.dbg.ims_volte_enable=1 \ + persist.dbg.volte_avail_ovr=1 \ + persist.dbg.vt_avail_ovr=1 \ + persist.dbg.wfc_avail_ovr=1 \ + persist.radio.data_lte_sys_ind=1 # Properties PRODUCT_PROPERTY_OVERRIDES += \