From ad1d8dd2aa149890548ef2ab031140751835135e Mon Sep 17 00:00:00 2001 From: AnierinB Date: Tue, 12 Aug 2025 13:17:50 -0700 Subject: [PATCH] milanf: Update ODM manifest skus and drop permissions Change-Id: I6e6dc9756d11fcb563477f6e14f9b782854cb04f Signed-off-by: AnierinB --- BoardConfig.mk | 4 +- device.mk | 9 --- .../unavail.android.hardware.nfc.hce.xml | 4 -- .../unavail.android.hardware.nfc.hcef.xml | 4 -- .../unavail.android.hardware.nfc.uicc.xml | 4 -- permissions/unavail.android.hardware.nfc.xml | 5 -- sku/manifest_b.xml | 72 ------------------- sku/manifest_d.xml | 16 ----- 8 files changed, 1 insertion(+), 117 deletions(-) delete mode 100644 permissions/unavail.android.hardware.nfc.hce.xml delete mode 100644 permissions/unavail.android.hardware.nfc.hcef.xml delete mode 100644 permissions/unavail.android.hardware.nfc.uicc.xml delete mode 100644 permissions/unavail.android.hardware.nfc.xml delete mode 100644 sku/manifest_b.xml delete mode 100644 sku/manifest_d.xml diff --git a/BoardConfig.mk b/BoardConfig.mk index 6308071..41119df 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -16,9 +16,7 @@ TARGET_BOOTLOADER_BOARD_NAME := milanf # HIDL DEVICE_MANIFEST_FILE += $(DEVICE_PATH)/manifest.xml -ODM_MANIFEST_SKUS += b d dn n -ODM_MANIFEST_B_FILES := $(DEVICE_PATH)/sku/manifest_b.xml -ODM_MANIFEST_D_FILES := $(DEVICE_PATH)/sku/manifest_d.xml +ODM_MANIFEST_SKUS += dn n ODM_MANIFEST_DN_FILES := $(DEVICE_PATH)/sku/manifest_dn.xml ODM_MANIFEST_N_FILES := $(DEVICE_PATH)/sku/manifest_n.xml diff --git a/device.mk b/device.mk index e636e74..fc3612a 100644 --- a/device.mk +++ b/device.mk @@ -66,15 +66,6 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.nfc.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.nfc.xml \ frameworks/native/data/etc/com.nxp.mifare.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/com.nxp.mifare.xml -DEVICE_SKUS := b d - -PRODUCT_COPY_FILES += \ -$(foreach DEVICE_SKU, $(DEVICE_SKUS), \ - $(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.hce.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.hce.xml \ - $(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.hcef.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.hcef.xml \ - $(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.uicc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.uicc.xml \ - $(LOCAL_PATH)/permissions/unavail.android.hardware.nfc.xml:$(TARGET_COPY_OUT_ODM)/etc/permissions/sku_$(DEVICE_SKU)/unavail.android.hardware.nfc.xml) - # Sensors PRODUCT_PACKAGES += \ sensors.milanf diff --git a/permissions/unavail.android.hardware.nfc.hce.xml b/permissions/unavail.android.hardware.nfc.hce.xml deleted file mode 100644 index d51b477..0000000 --- a/permissions/unavail.android.hardware.nfc.hce.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/permissions/unavail.android.hardware.nfc.hcef.xml b/permissions/unavail.android.hardware.nfc.hcef.xml deleted file mode 100644 index 52dfb76..0000000 --- a/permissions/unavail.android.hardware.nfc.hcef.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/permissions/unavail.android.hardware.nfc.uicc.xml b/permissions/unavail.android.hardware.nfc.uicc.xml deleted file mode 100644 index bbf821d..0000000 --- a/permissions/unavail.android.hardware.nfc.uicc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/permissions/unavail.android.hardware.nfc.xml b/permissions/unavail.android.hardware.nfc.xml deleted file mode 100644 index 62f0548..0000000 --- a/permissions/unavail.android.hardware.nfc.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - diff --git a/sku/manifest_b.xml b/sku/manifest_b.xml deleted file mode 100644 index e727057..0000000 --- a/sku/manifest_b.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - android.hardware.nfc - hwbinder - - - android.hardware.radio - hwbinder - @1.2::ISap/slot1 - @1.5::IRadio/slot1 - - - android.hardware.secure_element - hwbinder - @1.2::ISecureElement/SIM1 - - - vendor.qti.hardware.data.connection - hwbinder - @1.1::IDataConnection/slot1 - - - vendor.qti.hardware.data.iwlan - hwbinder - @1.0::IIWlan/slot1 - - - vendor.qti.hardware.radio.am - hwbinder - @1.0::IQcRilAudio/slot1 - - - vendor.qti.hardware.radio.ims - hwbinder - @1.7::IImsRadio/imsradio0 - - - vendor.qti.hardware.radio.lpa - hwbinder - @1.1::IUimLpa/UimLpa0 - - - vendor.qti.hardware.radio.qcrilhook - hwbinder - @1.0::IQtiOemHook/oemhook0 - - - vendor.qti.hardware.radio.qtiradio - hwbinder - @1.0::IQtiRadio/slot1 - @2.7::IQtiRadio/slot1 - - - vendor.qti.hardware.radio.uim - hwbinder - @1.2::IUim/Uim0 - - - vendor.qti.hardware.radio.uim_remote_client - hwbinder - @1.0::IUimRemoteServiceClient/uimRemoteClient0 - - - vendor.qti.hardware.radio.uim_remote_server - hwbinder - @1.0::IUimRemoteServiceServer/uimRemoteServer0 - - diff --git a/sku/manifest_d.xml b/sku/manifest_d.xml deleted file mode 100644 index c5701b6..0000000 --- a/sku/manifest_d.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - android.hardware.nfc - hwbinder - - - android.hardware.secure_element - hwbinder - @1.2::ISecureElement/SIM1 - @1.2::ISecureElement/SIM2 - -