From 7ec08a55ba6bb258fa6059ca4c507b72996fd4b8 Mon Sep 17 00:00:00 2001 From: Jan Altensen Date: Tue, 28 Apr 2020 17:39:54 +0200 Subject: [PATCH] exynos9610: proprietary-files: import ShannonIms Change-Id: I9defbd912640e1d0fba2e8285ae1ab70757a0801 --- BoardConfigCommon.mk | 3 +++ common.mk | 1 + extract-files.sh | 4 ++++ proprietary-files.txt | 7 +++++++ sepolicy/private/ims.te | 1 + sepolicy/private/seapp_contexts | 2 ++ 6 files changed, 18 insertions(+) create mode 100644 sepolicy/private/ims.te create mode 100644 sepolicy/private/seapp_contexts diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 60885b2..a856b96 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -99,5 +99,8 @@ BOARD_VNDK_VERSION := current # Audio USE_XML_AUDIO_POLICY_CONF := 1 +# sepolicy +BOARD_PLAT_PRIVATE_SEPOLICY_DIR := $(COMMON_PATH)/sepolicy/private + # Inherit from the proprietary version -include vendor/motorola/exynos9610-common/BoardConfigVendor.mk diff --git a/common.mk b/common.mk index fd37f64..ecb368a 100644 --- a/common.mk +++ b/common.mk @@ -71,6 +71,7 @@ PRODUCT_PACKAGES += \ # Permissions PRODUCT_COPY_FILES += \ + frameworks/native/data/etc/android.hardware.telephony.ims.xml:system/etc/permissions/android.hardware.telephony.ims.xml \ frameworks/native/data/etc/android.hardware.nfc.xml:system/etc/permissions/android.hardware.nfc.xml \ frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hce.xml \ frameworks/native/data/etc/android.hardware.nfc.hce.xml:system/etc/permissions/android.hardware.nfc.hcef.xml diff --git a/extract-files.sh b/extract-files.sh index bd2ad06..a217e02 100755 --- a/extract-files.sh +++ b/extract-files.sh @@ -65,4 +65,8 @@ setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${LINEAGE_ROOT}" true "${CLEAN_VEND extract "${MY_DIR}/proprietary-files.txt" "${SRC}" \ "${KANG}" --section "${SECTION}" +# Fix proprietary blobs +BLOB_ROOT="$LINEAGE_ROOT"/vendor/"$VENDOR"/"$DEVICE_COMMON"/proprietary +patchelf --replace-needed libmedia.so libmedia_ims.so $BLOB_ROOT/lib64/libmediaadaptor.so + "${MY_DIR}/setup-makefiles.sh" diff --git a/proprietary-files.txt b/proprietary-files.txt index 893a404..eff0dcb 100644 --- a/proprietary-files.txt +++ b/proprietary-files.txt @@ -6,3 +6,10 @@ lib64/libaptX_encoder.so -priv-app/HotwordEnrollmentOKGoogleCS47L35/HotwordEnrollmentOKGoogleCS47L35.apk -priv-app/HotwordEnrollmentTGoogleCS47L35/HotwordEnrollmentTGoogleCS47L35.apk -priv-app/HotwordEnrollmentXGoogleCS47L35/HotwordEnrollmentXGoogleCS47L35.apk + +# IMS +# ShannonIms.apk is modified to include IEPdgConnection* classes from stock's framework.jar +-app/ShannonIms/ShannonIms.apk|dd21afcb739938249e29d24cde3151fa1580bd2c +lib64/libmediaadaptor.so +lib64/libmedia.so:lib64/libmedia_ims.so +lib64/libePdgJni.so diff --git a/sepolicy/private/ims.te b/sepolicy/private/ims.te new file mode 100644 index 0000000..c60dc56 --- /dev/null +++ b/sepolicy/private/ims.te @@ -0,0 +1 @@ +type vendor_ims_app, domain; diff --git a/sepolicy/private/seapp_contexts b/sepolicy/private/seapp_contexts new file mode 100644 index 0000000..c2c62fa --- /dev/null +++ b/sepolicy/private/seapp_contexts @@ -0,0 +1,2 @@ +user=radio seinfo=platform name=com.shannon.imsservice domain=vendor_ims_app +user=radio seinfo=platform name=com.shannon.imsservice:remote domain=vendor_ims_app -- 2.20.1