From bfa61a3f25283baea340509e748516312b8f119c Mon Sep 17 00:00:00 2001 From: pix106 Date: Tue, 24 Oct 2023 15:13:33 +0200 Subject: [PATCH] sdm660-common: Cleanup duplicated build recipe & sepolicy --- BoardConfigCommon.mk | 4 +--- sdm660.mk | 12 ------------ sepolicy/vendor/untrusted_app.te | 1 - sepolicy/vendor/vendor_mutualex_exec.te | 3 --- 4 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 sepolicy/vendor/vendor_mutualex_exec.te diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index ad81f8b8..34090fde 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -11,6 +11,7 @@ COMMON_PATH := device/xiaomi/sdm660-common PRODUCT_USES_QCOM_HARDWARE := true PRODUCT_BOARD_PLATFORM := sdm660 OVERRIDE_QCOM_HARDWARE_VARIANT := sdm660 +TARGET_BOARD_PLATFORM := sdm660 # A/B ifeq ($(ENABLE_AB), true) @@ -67,9 +68,6 @@ QCOM_BT_USE_SMD_TTY := true TARGET_BOOTLOADER_BOARD_NAME := sdm660 TARGET_NO_BOOTLOADER := true -# Board -TARGET_BOARD_PLATFORM := sdm660 - # Build Rules BUILD_BROKEN_DUP_RULES := true diff --git a/sdm660.mk b/sdm660.mk index 4f6cccda..bd8b1736 100644 --- a/sdm660.mk +++ b/sdm660.mk @@ -215,11 +215,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ fstab.qcom -# fwk-detect -PRODUCT_PACKAGES += \ - libqti_vndfwk_detect \ - libqti_vndfwk_detect.vendor - # GMS PRODUCT_GMS_CLIENTID_BASE := android-xiaomi @@ -268,7 +263,6 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ android.hardware.biometrics.fingerprint@2.3.vendor \ android.hardware.bluetooth@1.0.vendor \ - android.frameworks.displayservice@1.0.vendor \ android.hardware.gatekeeper@1.0.vendor \ android.hardware.wifi.hostapd@1.3.vendor \ android.hardware.neuralnetworks@1.3 \ @@ -291,11 +285,6 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ IFAAService -# IMS -PRODUCT_PACKAGES += \ - ims-ext-common \ - ims_ext_common.xml - # Init PRODUCT_PACKAGES += \ init.class_main.sh \ @@ -423,7 +412,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.fingerprint.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.fingerprint.xml \ frameworks/native/data/etc/android.hardware.ethernet.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.ethernet.xml \ frameworks/native/data/etc/android.hardware.location.gps.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.gps.xml \ - frameworks/native/data/etc/android.hardware.opengles.aep.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.opengles.aep.xml \ frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \ frameworks/native/data/etc/android.hardware.sensor.barometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.barometer.xml \ frameworks/native/data/etc/android.hardware.sensor.compass.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.compass.xml \ diff --git a/sepolicy/vendor/untrusted_app.te b/sepolicy/vendor/untrusted_app.te index 0b7a456b..3221e5a6 100644 --- a/sepolicy/vendor/untrusted_app.te +++ b/sepolicy/vendor/untrusted_app.te @@ -16,7 +16,6 @@ dontaudit untrusted_app mnt_vendor_file:dir { search }; dontaudit untrusted_app proc:file { read }; dontaudit untrusted_app proc:file { open }; dontaudit untrusted_app proc_net_tcp_udp:file { open }; -dontaudit untrusted_app proc_version:file { read }; dontaudit untrusted_app_30 system_linker_exec:file { execmod }; allow untrusted_app rootfs:dir { read }; diff --git a/sepolicy/vendor/vendor_mutualex_exec.te b/sepolicy/vendor/vendor_mutualex_exec.te deleted file mode 100644 index 05efd2f8..00000000 --- a/sepolicy/vendor/vendor_mutualex_exec.te +++ /dev/null @@ -1,3 +0,0 @@ -init_daemon_domain(vendor_mutualex) - -allow vendor_mutualex self:socket create_socket_perms_no_ioctl;