diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index ab0697a..ad0217e 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -45,7 +45,6 @@ BOARD_KERNEL_PAGESIZE := 4096 BOARD_KERNEL_SEPARATED_DTBO := true BOARD_MKBOOTIMG_ARGS += --header_version $(BOARD_BOOT_HEADER_VERSION) BOARD_RAMDISK_USE_LZ4 := true -TARGET_KERNEL_NO_GCC := true TARGET_KERNEL_SOURCE := kernel/motorola/sm6375 TARGET_KERNEL_CONFIG := vendor/holi-qgki_defconfig vendor/ext_config/lineage_moto-holi.config @@ -105,7 +104,7 @@ DEVICE_MANIFEST_FILE += $(COMMON_PATH)/manifest.xml BOARD_USES_METADATA_PARTITION := true # Partitions --include vendor/lineage/config/BoardConfigReservedSize.mk +-include vendor/bliss/config/BoardConfigReservedSize.mk BOARD_BOOTIMAGE_PARTITION_SIZE := 100663296 BOARD_DTBOIMG_PARTITION_SIZE := 25165824 BOARD_VENDOR_BOOTIMAGE_PARTITION_SIZE := 100663296 @@ -142,6 +141,7 @@ TARGET_RECOVERY_WIPE := $(COMMON_PATH)/recovery/recovery.wipe ENABLE_VENDOR_RIL_SERVICE := true # SELinux +include device/bliss/sepolicy/libion/sepolicy.mk include device/qcom/sepolicy_vndr/SEPolicy.mk include hardware/motorola/sepolicy/qti/SEPolicy.mk BOARD_VENDOR_SEPOLICY_DIRS += $(COMMON_PATH)/sepolicy/vendor diff --git a/blob-patches/WfdCommon.patch b/blob-patches/WfdCommon.patch new file mode 100644 index 0000000..527a408 --- /dev/null +++ b/blob-patches/WfdCommon.patch @@ -0,0 +1,35 @@ +--- a/smali/com/qualcomm/wfd/ExtendedRemoteDisplay.smali ++++ b/smali/com/qualcomm/wfd/ExtendedRemoteDisplay.smali +@@ -1561,6 +1561,32 @@ + throw v3 + .end method + ++.method public static blacklist listen(Ljava/lang/String;Landroid/media/RemoteDisplay$Listener;Landroid/os/Handler;Landroid/content/Context;)Lcom/qualcomm/wfd/ExtendedRemoteDisplay; ++ .locals 2 ++ .param p0, "iface" # Ljava/lang/String; ++ .param p1, "listener" # Landroid/media/RemoteDisplay$Listener; ++ .param p2, "handler" # Landroid/os/Handler; ++ .param p3, "context" # Landroid/content/Context; ++ ++ move-object v0, p0 ++ ++ move-object v1, p1 ++ ++ move-object p0, p2 ++ ++ move-object p1, p3 ++ ++ const/4 p2, 0x0 ++ ++ const-string p3, "" ++ ++ invoke-static/range {v0 .. v5}, Lcom/qualcomm/wfd/ExtendedRemoteDisplay;->listen(Ljava/lang/String;Landroid/media/RemoteDisplay$Listener;Landroid/os/Handler;Landroid/content/Context;ILjava/lang/String;)Lcom/qualcomm/wfd/ExtendedRemoteDisplay; ++ ++ move-result-object v0 ++ ++ return-object v0 ++.end method ++ + .method public static blacklist listen(Ljava/lang/String;Landroid/media/RemoteDisplay$Listener;Landroid/os/Handler;Landroid/content/Context;ILjava/lang/String;)Lcom/qualcomm/wfd/ExtendedRemoteDisplay; + .locals 8 + .param p0, "iface" # Ljava/lang/String; diff --git a/common.mk b/common.mk index 2528ca4..01564dd 100644 --- a/common.mk +++ b/common.mk @@ -22,9 +22,6 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/developer_gsi_keys.mk) $(call inherit-product, hardware/qcom-caf/common/common.mk) # Overlays -DEVICE_PACKAGE_OVERLAYS += \ - $(LOCAL_PATH)/overlay-lineage - PRODUCT_ENFORCE_RRO_TARGETS := * PRODUCT_PACKAGES += \ @@ -32,8 +29,11 @@ PRODUCT_PACKAGES += \ FrameworksResProduct \ FrameworksResTarget \ LineageApertureAppCommon \ + LineageSdkOverlayCommon \ + LineageSettingsProviderOverlayCommon \ NcmTetheringOverlay \ SettingsProviderResCommon \ + SettingsResCommon \ SystemUIResCommon \ TelephonyResCommon \ TelephonyResProduct \ @@ -134,10 +134,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.drm-service.clearkey -# fastbootd -PRODUCT_PACKAGES += \ - fastbootd - # GPS PRODUCT_PACKAGES += \ android.hardware.gnss@2.1-impl-qti \ @@ -177,6 +173,9 @@ $(foreach f,$(wildcard $(LOCAL_PATH)/rootdir/bin/*.sh),\ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/recovery/root/init.recovery.qcom.rc:recovery/root/init.recovery.qcom.rc +# ION +$(call soong_config_set_bool,libion,legacy_impl,true) + # IPACM PRODUCT_PACKAGES += \ ipacm \ @@ -186,9 +185,6 @@ PRODUCT_PACKAGES += \ PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/sec_config:$(TARGET_COPY_OUT_VENDOR)/etc/sec_config -# Kernel -PRODUCT_ENABLE_UFFD_GC := true - # LiveDisplay PRODUCT_PACKAGES += \ vendor.lineage.livedisplay-service.sdm \ diff --git a/extract-files.py b/extract-files.py index 37ba57b..11c5d82 100755 --- a/extract-files.py +++ b/extract-files.py @@ -44,10 +44,12 @@ lib_fixups: lib_fixups_user_type = { } blob_fixups: blob_fixups_user_type = { + 'system/framework/WfdCommon.jar': blob_fixup() + .apktool_patch('blob-patches/WfdCommon.patch'), 'system_ext/etc/permissions/moto-telephony.xml': blob_fixup() .regex_replace('/system/', '/system_ext/'), - 'system_ext/lib64/libwfdnative.so': blob_fixup() - .add_needed('libinput_shim.so'), + 'system_ext/lib64/libwfdservice.so': blob_fixup() + .replace_needed('android.media.audio.common.types-V4-cpp.so', 'android.media.audio.common.types-V5-cpp.so'), 'system_ext/priv-app/ims/ims.apk': blob_fixup() .apktool_patch('ims-patches'), ( diff --git a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml b/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml deleted file mode 100644 index 82e0c07..0000000 --- a/overlay-lineage/lineage-sdk/lineage/res/res/values/config.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - true - - - - restart - restart_recovery - restart_bootloader - restart_fastboot - - diff --git a/proprietary-files.txt b/proprietary-files.txt index 2467953..7a0d964 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -839,35 +839,34 @@ vendor/lib64/libwvhidl.so # WiFi vendor/bin/cnss-daemon -# WiFi Display (system) - from dada OS2.0.217.0.WOCMIXM -system/framework/WfdCommon.jar;BOOT_JAR|76fab5ed43206989057284fa26e8b894f1da102f -system_ext/bin/wfdservice64:system_ext/bin/wfdservice|34851904d02d11d3cfebbc7b8745a9444ba3e7c5 +# WiFi Display (system) - from marvel_g A171WEH.20 +system/framework/WfdCommon.jar;BOOT_JAR|27251f8421652af8abffb1f3fd9449fe0ec64ee5|6d1f1d953c48a414e978263256e2ed3aec1580b7 +system_ext/bin/wfdservice64:system_ext/bin/wfdservice|6b738758fe3d21d6d53d3fb522e1321b54592fa9 system_ext/etc/init/wfdservice.rc|907def8565d8f91f531ca7dfad880af05d540b0c system_ext/etc/permissions/wfd-system-ext-privapp-permissions-qti.xml|6669d5ee462c981663b8ac573d84d334e4eed96c system_ext/etc/seccomp_policy/wfdservice64.policy|1e331272649395423b11c575892e0bdc9433b820 -system_ext/etc/wfdconfigsink.xml|d718bc1ccb3e6e52a0af7bf4de62445c0b083651 -system_ext/lib64/libmmrtpdecoder.so|8b143c0b004a2f5ab8d7911dd463de0ceea794e7 -system_ext/lib64/libmmrtpencoder.so|eef3f64e6c2892fc0c87e176f5a83f7fe07761d3 -system_ext/lib64/libwfdavenhancements.so|8c968c6930e44901ef8c6abd6356f2308600d90e -system_ext/lib64/libwfdclient.so|2d1bf9b010ecfb8532eaf6a12c8bf60f9e8ffe08 -system_ext/lib64/libwfdcommonutils.so|3ae375016a9551e51f26710e8b07d20eeef2b76f -system_ext/lib64/libwfdconfigutils.so|4d8200cc4c455f54fcbce927f5cabeb7b591f5d0 -system_ext/lib64/libwfddisplayconfig.so|27f5d6e284edf05cc7776e5be010912973000ab9 -system_ext/lib64/libwfdmminterface.so|8d3d493fef797aef2feaab4e09e50250ddf5dc9a -system_ext/lib64/libwfdmmsink.so|4569ce9941eb5d06db599146ed80b8a32d7cd97f -system_ext/lib64/libwfdmmsrc_system.so|0cc970954800566baddbf760b153b027940180f5 -system_ext/lib64/libwfdnative.so;SYMLINK=system_ext/priv-app/WfdService/lib/arm64/libwfdnative.so|9513bbbd813dd05fb063d3c9e72640a1bc9156c2|f2918bbd8e4c691299e840863e8cb502a47bb773 -system_ext/lib64/libwfdrtsp.so|1ab4fc5b75d25f551df3593d5856e6f7893a4176 -system_ext/lib64/libwfdservice.so|af0e31f17ed997a5d8bad64cdad486be28cb9f07 -system_ext/lib64/libwfdsinksm.so|cc899b719fa11d844c65908d7fdc18600451324d -system_ext/lib64/libwfduibcinterface.so|432d54b072d8f1c80409b6e11f4f833ca9576937 -system_ext/lib64/libwfduibcsink.so|d12b05bbcefdff6addc2c31567a656b7540d7489 -system_ext/lib64/libwfduibcsinkinterface.so|a41b4d1fa4307a247b1f059a5b5cdf7f6a645db3 -system_ext/lib64/libwfduibcsrc.so|5be7d282be9ab45297bd030f8e37a45f48aa8677 -system_ext/lib64/libwfduibcsrcinterface.so|0e32acc87c8518e8ebb44f6ef341a2e278e1e7c2 -system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so|2b2563450ad6a8d46d5648b97f63f87c5d9983ca -system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V1-ndk.so|58cd9358df40aa16ddf0e603b736c58588623b9e -system_ext/priv-app/WfdService/WfdService.apk|b8a1d9f83804d274fab6e09e0607082801207f60 +system_ext/lib64/libmmrtpdecoder.so|51c486b525879c1239062f0fa6b591c3e0abaaa0 +system_ext/lib64/libmmrtpencoder.so|946d85b6b852ee95e17b40b00c4c85ebfa72c85c +system_ext/lib64/libwfdavenhancements.so|e5a06c6ea07c0cd4ebb73b030b87bf5e51a553e3 +system_ext/lib64/libwfdclient.so|ae443c8657e680558cce30039409cee1e6ab5505 +system_ext/lib64/libwfdcommonutils.so|27c411978b486ccc075862fa2eff450990b9d47a +system_ext/lib64/libwfdconfigutils.so|d05d03298caf2e233c69689cf1fed0dd19a02be1 +system_ext/lib64/libwfddisplayconfig.so|2717202736b678390be7518ce6f69a63079e4217 +system_ext/lib64/libwfdmminterface.so|b560306dbc7b2bffb734c8eb6439dd3721f75c12 +system_ext/lib64/libwfdmmsink.so|a250fd4085ec04345db8067f11962f57c3b166f0 +system_ext/lib64/libwfdmmsrc_system.so|69e08746a9557ee5fba3e02a8170032db0fa0105 +system_ext/lib64/libwfdnative.so;SYMLINK=system_ext/priv-app/WfdService/lib/arm64/libwfdnative.so|923acb22f26dc3aab5115cf685a161611e43c018 +system_ext/lib64/libwfdrtsp.so|14eec96c4fa615096c473d5a269ba315a53cfd00 +system_ext/lib64/libwfdservice.so|429839b831a8b16fb858179241dc6183c50bdf13|54624fd8c8ef2932e71c4b3ce176fb712e884f5a +system_ext/lib64/libwfdsinksm.so|e714120166d6480ada0b629ddd73c499c73c55a2 +system_ext/lib64/libwfduibcinterface.so|62a596c93efa57bdc79b078d74a3ccf4d19d1f58 +system_ext/lib64/libwfduibcsink.so|a6fc5d0245e23648812a535f7338d562c9317f09 +system_ext/lib64/libwfduibcsinkinterface.so|2db07ec7a9a6206d2782439e247b35fbe62a550f +system_ext/lib64/libwfduibcsrc.so|ac3e0988fb5c36c6c4561f04e0e5d53d7de2ad76 +system_ext/lib64/libwfduibcsrcinterface.so|d19e9b5c35f61cc696a9c999dce6eb11d781bd8c +system_ext/lib64/vendor.qti.hardware.wifidisplaysession@1.0.so|7b3051498476202797fce711a6dcc42ae6a7b8ea +system_ext/lib64/vendor.qti.hardware.wifidisplaysession_aidl-V2-ndk.so|b2f864d6ae621758bef6f4081af353e2e11e04d8 +system_ext/priv-app/WfdService/WfdService.apk|7d7e4ce1ec07338f1d2abf39035a8f44714a4a40 # WiFi Display (vendor) vendor/bin/wfdhdcphalservice diff --git a/resource-overlay/common/LineageSdkOverlay/Android.bp b/resource-overlay/common/LineageSdkOverlay/Android.bp new file mode 100644 index 0000000..3671e93 --- /dev/null +++ b/resource-overlay/common/LineageSdkOverlay/Android.bp @@ -0,0 +1,9 @@ +// +// SPDX-FileCopyrightText: The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +runtime_resource_overlay { + name: "LineageSdkOverlayCommon", + vendor: true, +} diff --git a/resource-overlay/common/LineageSdkOverlay/AndroidManifest.xml b/resource-overlay/common/LineageSdkOverlay/AndroidManifest.xml new file mode 100644 index 0000000..ac40e93 --- /dev/null +++ b/resource-overlay/common/LineageSdkOverlay/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/resource-overlay/common/LineageSdkOverlay/res/values/config.xml b/resource-overlay/common/LineageSdkOverlay/res/values/config.xml new file mode 100644 index 0000000..da51e5f --- /dev/null +++ b/resource-overlay/common/LineageSdkOverlay/res/values/config.xml @@ -0,0 +1,9 @@ + + + + + true + diff --git a/resource-overlay/common/LineageSettingsProvider/Android.bp b/resource-overlay/common/LineageSettingsProvider/Android.bp new file mode 100644 index 0000000..c424c82 --- /dev/null +++ b/resource-overlay/common/LineageSettingsProvider/Android.bp @@ -0,0 +1,9 @@ +// +// SPDX-FileCopyrightText: The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +runtime_resource_overlay { + name: "LineageSettingsProviderOverlayCommon", + vendor: true, +} diff --git a/resource-overlay/common/LineageSettingsProvider/AndroidManifest.xml b/resource-overlay/common/LineageSettingsProvider/AndroidManifest.xml new file mode 100644 index 0000000..b0d7f9e --- /dev/null +++ b/resource-overlay/common/LineageSettingsProvider/AndroidManifest.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml b/resource-overlay/common/LineageSettingsProvider/res/values/defaults.xml similarity index 100% rename from overlay-lineage/lineage-sdk/packages/LineageSettingsProvider/res/values/defaults.xml rename to resource-overlay/common/LineageSettingsProvider/res/values/defaults.xml diff --git a/resource-overlay/common/Settings/Android.bp b/resource-overlay/common/Settings/Android.bp new file mode 100644 index 0000000..c67362e --- /dev/null +++ b/resource-overlay/common/Settings/Android.bp @@ -0,0 +1,9 @@ +// +// SPDX-FileCopyrightText: The LineageOS Project +// SPDX-License-Identifier: Apache-2.0 +// + +runtime_resource_overlay { + name: "SettingsResCommon", + vendor: true, +} diff --git a/resource-overlay/common/Settings/AndroidManifest.xml b/resource-overlay/common/Settings/AndroidManifest.xml new file mode 100644 index 0000000..67e4cad --- /dev/null +++ b/resource-overlay/common/Settings/AndroidManifest.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/overlay-lineage/packages/apps/Settings/res/values/config.xml b/resource-overlay/common/Settings/res/values/config.xml similarity index 86% rename from overlay-lineage/packages/apps/Settings/res/values/config.xml rename to resource-overlay/common/Settings/res/values/config.xml index 4590a31..9e996ef 100644 --- a/overlay-lineage/packages/apps/Settings/res/values/config.xml +++ b/resource-overlay/common/Settings/res/values/config.xml @@ -3,7 +3,7 @@ SPDX-FileCopyrightText: The LineageOS Project SPDX-License-Identifier: Apache-2.0 --> - + true