back to pie mobicore

works now for unknown reasons

Change-Id: Ib8dd4b6ce6d1ba41abc6a1232541e01a93e6f7cd

diff --git a/proprietary/app/mcRegistry/00060308060501020000000000000000.tlbin b/proprietary/app/mcRegistry/00060308060501020000000000000000.tlbin
index 405fd7b5f69da62485813deffc3fd557d3cd7f4f..d2e78b8d7a23d0e97ffda9a2baa07f0762f1b6f4 100644 (file)
Binary files a/proprietary/app/mcRegistry/00060308060501020000000000000000.tlbin and b/proprietary/app/mcRegistry/00060308060501020000000000000000.tlbin differ

diff --git a/proprietary/app/mcRegistry/ffffffff000000000000000000000004.tlbin b/proprietary/app/mcRegistry/ffffffff000000000000000000000004.tlbin
index 63d38a15f75f555fd1e064423a20e56841659a94..c1c0eed8ed268ba27b368000d4de4c9c261b9db2 100644 (file)
Binary files a/proprietary/app/mcRegistry/ffffffff000000000000000000000004.tlbin and b/proprietary/app/mcRegistry/ffffffff000000000000000000000004.tlbin differ

diff --git a/proprietary/app/mcRegistry/ffffffff000000000000000000000005.tlbin b/proprietary/app/mcRegistry/ffffffff000000000000000000000005.tlbin
index 8222e4cc3c567fcf9a5492824877bedd7abab68c..4474ba2dfbd86f23bc0da78231b20befdf854900 100644 (file)
Binary files a/proprietary/app/mcRegistry/ffffffff000000000000000000000005.tlbin and b/proprietary/app/mcRegistry/ffffffff000000000000000000000005.tlbin differ

diff --git a/proprietary/app/mcRegistry/ffffffff00000000000000000000000a.tlbin b/proprietary/app/mcRegistry/ffffffff00000000000000000000000a.tlbin
index 867ee66493d21745398b0b235228af29cd9a19d1..4802283c624823792db1dd9b53b65b793f289052 100644 (file)
Binary files a/proprietary/app/mcRegistry/ffffffff00000000000000000000000a.tlbin and b/proprietary/app/mcRegistry/ffffffff00000000000000000000000a.tlbin differ

diff --git a/proprietary/app/mcRegistry/ffffffff00000000000000000000000c.tlbin b/proprietary/app/mcRegistry/ffffffff00000000000000000000000c.tlbin
index 6490b484371cd8bb22e1f4d5516bd4231a90f522..964a8a7f803abcab25daa29a022a70472ded4c1a 100644 (file)
Binary files a/proprietary/app/mcRegistry/ffffffff00000000000000000000000c.tlbin and b/proprietary/app/mcRegistry/ffffffff00000000000000000000000c.tlbin differ

diff --git a/proprietary/app/mcRegistry/ffffffff00000000000000000000000d.tlbin b/proprietary/app/mcRegistry/ffffffff00000000000000000000000d.tlbin
index 82727c9de65d19235a20469375657540849e4029..052cf6a831d5f6984833540be798e3e9452ed10d 100644 (file)
Binary files a/proprietary/app/mcRegistry/ffffffff00000000000000000000000d.tlbin and b/proprietary/app/mcRegistry/ffffffff00000000000000000000000d.tlbin differ

diff --git a/proprietary/app/mcRegistry/ffffffff000000000000000000000030.tlbin b/proprietary/app/mcRegistry/ffffffff000000000000000000000030.tlbin
deleted file mode 100644 (file)
index f38be89..0000000
Binary files a/proprietary/app/mcRegistry/ffffffff000000000000000000000030.tlbin and /dev/null differ

diff --git a/proprietary/app/mcRegistry/ffffffff000000000000000000000038.tlbin b/proprietary/app/mcRegistry/ffffffff000000000000000000000038.tlbin
new file mode 100644 (file)
index 0000000..7bef146
Binary files /dev/null and b/proprietary/app/mcRegistry/ffffffff000000000000000000000038.tlbin differ

diff --git a/proprietary/app/mcRegistry/ffffffff00000000000000000000003e.tlbin b/proprietary/app/mcRegistry/ffffffff00000000000000000000003e.tlbin
index b65b22389e3f3deb75486e996ba62486fd17c786..4d123d2e7f8e355e6fe92d2cb48b16911ffab0f6 100644 (file)
Binary files a/proprietary/app/mcRegistry/ffffffff00000000000000000000003e.tlbin and b/proprietary/app/mcRegistry/ffffffff00000000000000000000003e.tlbin differ

diff --git a/proprietary/app/mcRegistry/ffffffff000000000000000000000041.tlbin b/proprietary/app/mcRegistry/ffffffff000000000000000000000041.tlbin
index aea68feea3dc8edfec31ccb5c8ddc8ea690c1d62..7ae66ae4acdfa53d1124f516f7655b39e080955e 100644 (file)
Binary files a/proprietary/app/mcRegistry/ffffffff000000000000000000000041.tlbin and b/proprietary/app/mcRegistry/ffffffff000000000000000000000041.tlbin differ

diff --git a/proprietary/app/mcRegistry/ffffffff000000000000000000000045.tlbin b/proprietary/app/mcRegistry/ffffffff000000000000000000000045.tlbin
index 2f6dbbfca3b9d7ec72ec4b60c8c9870b06b528d8..719864bf052287ee998cc0db535cdae7ca3bdf1b 100644 (file)
Binary files a/proprietary/app/mcRegistry/ffffffff000000000000000000000045.tlbin and b/proprietary/app/mcRegistry/ffffffff000000000000000000000045.tlbin differ

diff --git a/proprietary/app/mcRegistry/ffffffff000000000000000000000047.tlbin b/proprietary/app/mcRegistry/ffffffff000000000000000000000047.tlbin
index 31b70c15000f33439990d3963ead1e6b49fced82..f1abdbda16bf9dd90a41917653a887e08d0b0eb7 100644 (file)
Binary files a/proprietary/app/mcRegistry/ffffffff000000000000000000000047.tlbin and b/proprietary/app/mcRegistry/ffffffff000000000000000000000047.tlbin differ

diff --git a/proprietary/app/mcRegistry/ffffffff000000000000000000000059.tlbin b/proprietary/app/mcRegistry/ffffffff000000000000000000000059.tlbin
index 798afa7f5de0d91a8dfd452f99423d0b3f7a5b0e..d35fb1913f8636d270c2c3ba7d97f2f024783d5b 100644 (file)
Binary files a/proprietary/app/mcRegistry/ffffffff000000000000000000000059.tlbin and b/proprietary/app/mcRegistry/ffffffff000000000000000000000059.tlbin differ

diff --git a/proprietary/app/mcRegistry/ffffffffd00000000000000000000004.tlbin b/proprietary/app/mcRegistry/ffffffffd00000000000000000000004.tlbin
index aea372490a3fb8b53ffce893f6c3b9b1ee278b51..76fd0f577ac4e91ca95b9bd4c4636004c6735dbc 100644 (file)
Binary files a/proprietary/app/mcRegistry/ffffffffd00000000000000000000004.tlbin and b/proprietary/app/mcRegistry/ffffffffd00000000000000000000004.tlbin differ

diff --git a/proprietary/app/mcRegistry/ffffffffd0000000000000000000001a.tlbin b/proprietary/app/mcRegistry/ffffffffd0000000000000000000001a.tlbin
index 153d7975660a93eddd9649e259acef41173c5ffd..b2c24cb1340f1b20038eb0ef6d771cd84ddf6b98 100644 (file)
Binary files a/proprietary/app/mcRegistry/ffffffffd0000000000000000000001a.tlbin and b/proprietary/app/mcRegistry/ffffffffd0000000000000000000001a.tlbin differ

diff --git a/proprietary/app/mcRegistry/fffffffff0000000000000000000001b.tlbin b/proprietary/app/mcRegistry/fffffffff0000000000000000000001b.tlbin
index 196e21d94c2cf056d4969601b641b08c3a133ea9..94b35245b8f720dee003b8c0120b08cfc0f72cf4 100644 (file)
Binary files a/proprietary/app/mcRegistry/fffffffff0000000000000000000001b.tlbin and b/proprietary/app/mcRegistry/fffffffff0000000000000000000001b.tlbin differ

diff --git a/proprietary/app/mcRegistry/fffffffff0000000000000000000001e.tlbin b/proprietary/app/mcRegistry/fffffffff0000000000000000000001e.tlbin
deleted file mode 100644 (file)
index 4d6224c..0000000
Binary files a/proprietary/app/mcRegistry/fffffffff0000000000000000000001e.tlbin and /dev/null differ

diff --git a/proprietary/lib/vendor.trustonic.teeregistry@1.0.so b/proprietary/lib/vendor.trustonic.teeregistry@1.0.so
deleted file mode 100644 (file)
index b54b220..0000000
Binary files a/proprietary/lib/vendor.trustonic.teeregistry@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/vendor.trustonic.tee@1.0.so b/proprietary/lib64/vendor.trustonic.tee@1.0.so
deleted file mode 100644 (file)
index 2563962..0000000
Binary files a/proprietary/lib64/vendor.trustonic.tee@1.0.so and /dev/null differ

diff --git a/proprietary/lib64/vendor.trustonic.teeregistry@1.0.so b/proprietary/lib64/vendor.trustonic.teeregistry@1.0.so
deleted file mode 100644 (file)
index 791bda3..0000000
Binary files a/proprietary/lib64/vendor.trustonic.teeregistry@1.0.so and /dev/null differ

diff --git a/proprietary/vendor/app/mcRegistry/08130000000000000000000000000000.tlbin b/proprietary/vendor/app/mcRegistry/08130000000000000000000000000000.tlbin
index 044260d3684bccb8429a46c3aab833d9aac8a788..1864b17f873d73e61ee31bea193071283276b7fe 100644 (file)
Binary files a/proprietary/vendor/app/mcRegistry/08130000000000000000000000000000.tlbin and b/proprietary/vendor/app/mcRegistry/08130000000000000000000000000000.tlbin differ

diff --git a/proprietary/vendor/app/mcRegistry/FFFFFFFF000000000000000000000001.drbin b/proprietary/vendor/app/mcRegistry/FFFFFFFF000000000000000000000001.drbin
index f576d4e659e22a34eb65830070a103df8c2fc9f1..45311626db9fd66a81d8040a17811a0c4c57b245 100644 (file)
Binary files a/proprietary/vendor/app/mcRegistry/FFFFFFFF000000000000000000000001.drbin and b/proprietary/vendor/app/mcRegistry/FFFFFFFF000000000000000000000001.drbin differ

diff --git a/proprietary/vendor/app/mcRegistry/ffffffff00000000000000000000000e.tlbin b/proprietary/vendor/app/mcRegistry/ffffffff00000000000000000000000e.tlbin
index 5678981a0edd94d92a2a1660bde17ef15e2644a1..620e750f210391f0bf4374dbab5d31d6e01c605c 100644 (file)
Binary files a/proprietary/vendor/app/mcRegistry/ffffffff00000000000000000000000e.tlbin and b/proprietary/vendor/app/mcRegistry/ffffffff00000000000000000000000e.tlbin differ

diff --git a/proprietary/vendor/app/mcRegistry/ffffffff00000000000000000000000f.tlbin b/proprietary/vendor/app/mcRegistry/ffffffff00000000000000000000000f.tlbin
index 3547b1fffcc263bc1d81d52141bd40fd85856520..9e55be8062b08bab7f82722c6d1837bd7faf3494 100644 (file)
Binary files a/proprietary/vendor/app/mcRegistry/ffffffff00000000000000000000000f.tlbin and b/proprietary/vendor/app/mcRegistry/ffffffff00000000000000000000000f.tlbin differ

diff --git a/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000012.tlbin b/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000012.tlbin
index 6d602cbc45b284a88da3e0030b692431b33de8f6..d8bd42a01c0bd1f854d70b6463e758c24a91018e 100644 (file)
Binary files a/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000012.tlbin and b/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000012.tlbin differ

diff --git a/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000013.tlbin b/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000013.tlbin
index 17fa36439b5a1903c7efa465abae9730ad2f3386..66f3317989b7c1d32e47916adc8fac4c002b9a6d 100644 (file)
Binary files a/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000013.tlbin and b/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000013.tlbin differ

diff --git a/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000030.tlbin b/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000030.tlbin
new file mode 100644 (file)
index 0000000..8ae83ab
Binary files /dev/null and b/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000030.tlbin differ

diff --git a/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000038.tlbin b/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000038.tlbin
deleted file mode 100644 (file)
index 8517dcc..0000000
Binary files a/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000038.tlbin and /dev/null differ

diff --git a/proprietary/vendor/app/mcRegistry/ffffffffd0000000000000000000000a.tlbin b/proprietary/vendor/app/mcRegistry/ffffffffd0000000000000000000000a.tlbin
index 09f40f93517a312979a67cf76f1f1a673738b054..53602c3c0312b363e53a472d8087df895fb2bbbc 100644 (file)
Binary files a/proprietary/vendor/app/mcRegistry/ffffffffd0000000000000000000000a.tlbin and b/proprietary/vendor/app/mcRegistry/ffffffffd0000000000000000000000a.tlbin differ

diff --git a/proprietary/vendor/app/mcRegistry/ffffffffd00000000000000000000014.tlbin b/proprietary/vendor/app/mcRegistry/ffffffffd00000000000000000000014.tlbin
index 8f1ec36fba6586b46ad47aecd49e4c521c2fa1ec..92d83396a8a0f5e30483c92fa4480d793e7b214a 100644 (file)
Binary files a/proprietary/vendor/app/mcRegistry/ffffffffd00000000000000000000014.tlbin and b/proprietary/vendor/app/mcRegistry/ffffffffd00000000000000000000014.tlbin differ

diff --git a/proprietary/vendor/app/mcRegistry/ffffffffd00000000000000000000016.tlbin b/proprietary/vendor/app/mcRegistry/ffffffffd00000000000000000000016.tlbin
index 16cbde27f4e965db1b337029312f2fa685bd4ee5..be2e2cc7c9d3fd4ecb3688eb9ca216d98f27de19 100644 (file)
Binary files a/proprietary/vendor/app/mcRegistry/ffffffffd00000000000000000000016.tlbin and b/proprietary/vendor/app/mcRegistry/ffffffffd00000000000000000000016.tlbin differ

diff --git a/proprietary/vendor/bin/hw/vendor.trustonic.tee@1.0-service b/proprietary/vendor/bin/hw/vendor.trustonic.tee@1.0-service
deleted file mode 100644 (file)
index 889c3ef..0000000
Binary files a/proprietary/vendor/bin/hw/vendor.trustonic.tee@1.0-service and /dev/null differ

diff --git a/proprietary/vendor/bin/hw/vendor.trustonic.teeregistry@1.0-service b/proprietary/vendor/bin/hw/vendor.trustonic.teeregistry@1.0-service
deleted file mode 100644 (file)
index 3e3fd4c..0000000
Binary files a/proprietary/vendor/bin/hw/vendor.trustonic.teeregistry@1.0-service and /dev/null differ

diff --git a/proprietary/vendor/bin/mcDriverDaemon b/proprietary/vendor/bin/mcDriverDaemon
index d6f06eae5c5dbf8c394cb70ead3e971d89db39d0..798b88ceb242c93945493e7af5df53e7a413aa80 100644 (file)
Binary files a/proprietary/vendor/bin/mcDriverDaemon and b/proprietary/vendor/bin/mcDriverDaemon differ

diff --git a/proprietary/vendor/etc/init/vendor.trustonic.tee@1.0-service.rc b/proprietary/vendor/etc/init/vendor.trustonic.tee@1.0-service.rc
deleted file mode 100644 (file)
index ad3ce7c..0000000
--- a/proprietary/vendor/etc/init/vendor.trustonic.tee@1.0-service.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-service tee-1-0 /vendor/bin/hw/vendor.trustonic.tee@1.0-service
-    class hal
-    user system
-    group system

diff --git a/proprietary/vendor/etc/init/vendor.trustonic.teeregistry@1.0-service.rc b/proprietary/vendor/etc/init/vendor.trustonic.teeregistry@1.0-service.rc
deleted file mode 100644 (file)
index c657de3..0000000
--- a/proprietary/vendor/etc/init/vendor.trustonic.teeregistry@1.0-service.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-service teeregistry-1-0 /vendor/bin/hw/vendor.trustonic.teeregistry@1.0-service
-    class hal
-    user system
-    group system

diff --git a/proprietary/vendor/lib/hw/gatekeeper.exynos8895.so b/proprietary/vendor/lib/hw/gatekeeper.exynos8895.so
index caba94ba520038d4038f990eb44c70ff6eaf4d12..226d40bb03fe8d9c2f5bb793c6045deb6d6792c8 100644 (file)
Binary files a/proprietary/vendor/lib/hw/gatekeeper.exynos8895.so and b/proprietary/vendor/lib/hw/gatekeeper.exynos8895.so differ

diff --git a/proprietary/vendor/lib/libMcClient.so b/proprietary/vendor/lib/libMcClient.so
index 211ef196687bf2e0009719c59ccc11333e379f11..25a107eff133d37688a3af87c7b00e8c8f076ef6 100644 (file)
Binary files a/proprietary/vendor/lib/libMcClient.so and b/proprietary/vendor/lib/libMcClient.so differ

diff --git a/proprietary/vendor/lib/libMcRegistry.so b/proprietary/vendor/lib/libMcRegistry.so
deleted file mode 100644 (file)
index 69f7006..0000000
Binary files a/proprietary/vendor/lib/libMcRegistry.so and /dev/null differ

diff --git a/proprietary/vendor/lib64/hw/gatekeeper.exynos8895.so b/proprietary/vendor/lib64/hw/gatekeeper.exynos8895.so
index 570991ed94c85eacc98e00b06e6fb4bfdd3be6c3..ded11aeeebc07592c342bcbf5b84ec6ce8eb032a 100644 (file)
Binary files a/proprietary/vendor/lib64/hw/gatekeeper.exynos8895.so and b/proprietary/vendor/lib64/hw/gatekeeper.exynos8895.so differ

diff --git a/proprietary/vendor/lib64/hw/keystore.mdfpp.so b/proprietary/vendor/lib64/hw/keystore.mdfpp.so
index 8576cc84f652947a8beff08f367be0844c97a09b..82ab973e38647e19d8f06acc6bcce4af3be0b722 100644 (file)
Binary files a/proprietary/vendor/lib64/hw/keystore.mdfpp.so and b/proprietary/vendor/lib64/hw/keystore.mdfpp.so differ

diff --git a/proprietary/vendor/lib64/libMcClient.so b/proprietary/vendor/lib64/libMcClient.so
index 154a4310ca70b373a5b51e28bf5f6454f8b93995..1adebb649f45b594cb17de09b927eaf6e38dc7b3 100644 (file)
Binary files a/proprietary/vendor/lib64/libMcClient.so and b/proprietary/vendor/lib64/libMcClient.so differ

diff --git a/proprietary/vendor/lib64/libMcRegistry.so b/proprietary/vendor/lib64/libMcRegistry.so
deleted file mode 100644 (file)
index e3dd0ae..0000000
Binary files a/proprietary/vendor/lib64/libMcRegistry.so and /dev/null differ

diff --git a/proprietary/vendor/lib64/libkeymaster_helper.so b/proprietary/vendor/lib64/libkeymaster_helper.so
index 9cdcd4d27ae064b09d204a9d5719d91a1dd3b82d..c26e81713960bd8ceabbb3854c2747993b21ce1e 100644 (file)
Binary files a/proprietary/vendor/lib64/libkeymaster_helper.so and b/proprietary/vendor/lib64/libkeymaster_helper.so differ

diff --git a/proprietary/vendor/lib64/libkeymaster_mdfpp.so b/proprietary/vendor/lib64/libkeymaster_mdfpp.so
index c04b43afff3477c9df51643fe27162812a245f28..eb4580709bcea352c7497b66c7bd4ff06dde1c0d 100644 (file)
Binary files a/proprietary/vendor/lib64/libkeymaster_mdfpp.so and b/proprietary/vendor/lib64/libkeymaster_mdfpp.so differ

diff --git a/universal8895-common-vendor.mk b/universal8895-common-vendor.mk
index b47fc2d1fbf44074ac56f3ce45be518a3c04529a..9e2148a30e10a4867879edd58fa6c40e7c7fae3b 100644 (file)
--- a/universal8895-common-vendor.mk
+++ b/universal8895-common-vendor.mk
@@ -23,7 +23,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/app/mcRegistry/ffffffff00000000000000000000000d.tlbin:system/app/mcRegistry/ffffffff00000000000000000000000d.tlbin \
     vendor/samsung/universal8895-common/proprietary/app/mcRegistry/ffffffff000000000000000000000016.tlbin:system/app/mcRegistry/ffffffff000000000000000000000016.tlbin \
     vendor/samsung/universal8895-common/proprietary/app/mcRegistry/ffffffff000000000000000000000017.tlbin:system/app/mcRegistry/ffffffff000000000000000000000017.tlbin \
-    vendor/samsung/universal8895-common/proprietary/app/mcRegistry/ffffffff000000000000000000000030.tlbin:system/app/mcRegistry/ffffffff000000000000000000000030.tlbin \
+    vendor/samsung/universal8895-common/proprietary/app/mcRegistry/ffffffff000000000000000000000038.tlbin:system/app/mcRegistry/ffffffff000000000000000000000038.tlbin \
     vendor/samsung/universal8895-common/proprietary/app/mcRegistry/ffffffff00000000000000000000003e.tlbin:system/app/mcRegistry/ffffffff00000000000000000000003e.tlbin \
     vendor/samsung/universal8895-common/proprietary/app/mcRegistry/ffffffff000000000000000000000041.tlbin:system/app/mcRegistry/ffffffff000000000000000000000041.tlbin \
     vendor/samsung/universal8895-common/proprietary/app/mcRegistry/ffffffff000000000000000000000045.tlbin:system/app/mcRegistry/ffffffff000000000000000000000045.tlbin \
@@ -34,7 +34,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/app/mcRegistry/ffffffffd00000000000000000000017.tlbin:system/app/mcRegistry/ffffffffd00000000000000000000017.tlbin \
     vendor/samsung/universal8895-common/proprietary/app/mcRegistry/ffffffffd0000000000000000000001a.tlbin:system/app/mcRegistry/ffffffffd0000000000000000000001a.tlbin \
     vendor/samsung/universal8895-common/proprietary/app/mcRegistry/fffffffff0000000000000000000001b.tlbin:system/app/mcRegistry/fffffffff0000000000000000000001b.tlbin \
-    vendor/samsung/universal8895-common/proprietary/app/mcRegistry/fffffffff0000000000000000000001e.tlbin:system/app/mcRegistry/fffffffff0000000000000000000001e.tlbin \
     vendor/samsung/universal8895-common/proprietary/bin/lpm:system/bin/lpm \
     vendor/samsung/universal8895-common/proprietary/etc/audio_effects.conf:system/etc/audio_effects.conf \
     vendor/samsung/universal8895-common/proprietary/etc/gps_debug.conf:system/etc/gps_debug.conf \
@@ -122,7 +121,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/lib/vendor.samsung.hardware.radio.sechook@1.0.so:system/lib/vendor.samsung.hardware.radio.sechook@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib/vendor.samsung.hardware.radio@1.2.so:system/lib/vendor.samsung.hardware.radio@1.2.so \
     vendor/samsung/universal8895-common/proprietary/lib/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0.so:system/lib/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib/vendor.trustonic.teeregistry@1.0.so:system/lib/vendor.trustonic.teeregistry@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.bluetooth.a2dp@1.0.so:system/lib64/android.hardware.bluetooth.a2dp@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.bluetooth@1.0.so:system/lib64/android.hardware.bluetooth@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/android.hardware.gnss@1.0.so:system/lib64/android.hardware.gnss@1.0.so \
@@ -182,8 +180,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.radio.sechook@1.0.so:system/lib64/vendor.samsung.hardware.radio.sechook@1.0.so \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung.hardware.radio@1.2.so:system/lib64/vendor.samsung.hardware.radio@1.2.so \
     vendor/samsung/universal8895-common/proprietary/lib64/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0.so:system/lib64/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/vendor.trustonic.tee@1.0.so:system/lib64/vendor.trustonic.tee@1.0.so \
-    vendor/samsung/universal8895-common/proprietary/lib64/vendor.trustonic.teeregistry@1.0.so:system/lib64/vendor.trustonic.teeregistry@1.0.so \
     vendor/samsung/universal8895-common/proprietary/media/battery_error.spi:system/media/battery_error.spi \
     vendor/samsung/universal8895-common/proprietary/media/battery_low.spi:system/media/battery_low.spi \
     vendor/samsung/universal8895-common/proprietary/media/battery_temperature_error.spi:system/media/battery_temperature_error.spi \
@@ -207,7 +203,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000012.tlbin:$(TARGET_COPY_OUT_VENDOR)/app/mcRegistry/ffffffff000000000000000000000012.tlbin \
     vendor/samsung/universal8895-common/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000013.tlbin:$(TARGET_COPY_OUT_VENDOR)/app/mcRegistry/ffffffff000000000000000000000013.tlbin \
     vendor/samsung/universal8895-common/proprietary/vendor/app/mcRegistry/ffffffff00000000000000000000002f.tlbin:$(TARGET_COPY_OUT_VENDOR)/app/mcRegistry/ffffffff00000000000000000000002f.tlbin \
-    vendor/samsung/universal8895-common/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000038.tlbin:$(TARGET_COPY_OUT_VENDOR)/app/mcRegistry/ffffffff000000000000000000000038.tlbin \
+    vendor/samsung/universal8895-common/proprietary/vendor/app/mcRegistry/ffffffff000000000000000000000030.tlbin:$(TARGET_COPY_OUT_VENDOR)/app/mcRegistry/ffffffff000000000000000000000030.tlbin \
     vendor/samsung/universal8895-common/proprietary/vendor/app/mcRegistry/ffffffffd0000000000000000000000a.tlbin:$(TARGET_COPY_OUT_VENDOR)/app/mcRegistry/ffffffffd0000000000000000000000a.tlbin \
     vendor/samsung/universal8895-common/proprietary/vendor/app/mcRegistry/ffffffffd0000000000000000000000e.tlbin:$(TARGET_COPY_OUT_VENDOR)/app/mcRegistry/ffffffffd0000000000000000000000e.tlbin \
     vendor/samsung/universal8895-common/proprietary/vendor/app/mcRegistry/ffffffffd00000000000000000000014.tlbin:$(TARGET_COPY_OUT_VENDOR)/app/mcRegistry/ffffffffd00000000000000000000014.tlbin \
@@ -224,8 +220,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/bin/hw/vendor.samsung.hardware.gnss@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.samsung.hardware.gnss@1.0-service \
     vendor/samsung/universal8895-common/proprietary/vendor/bin/hw/vendor.samsung.hardware.radio.configsvc@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.samsung.hardware.radio.configsvc@1.0-service \
     vendor/samsung/universal8895-common/proprietary/vendor/bin/hw/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0-service \
-    vendor/samsung/universal8895-common/proprietary/vendor/bin/hw/vendor.trustonic.tee@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.trustonic.tee@1.0-service \
-    vendor/samsung/universal8895-common/proprietary/vendor/bin/hw/vendor.trustonic.teeregistry@1.0-service:$(TARGET_COPY_OUT_VENDOR)/bin/hw/vendor.trustonic.teeregistry@1.0-service \
     vendor/samsung/universal8895-common/proprietary/vendor/bin/mcDriverDaemon:$(TARGET_COPY_OUT_VENDOR)/bin/mcDriverDaemon \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/SoundBoosterParam.txt:$(TARGET_COPY_OUT_VENDOR)/etc/SoundBoosterParam.txt \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/abox_debug.xml:$(TARGET_COPY_OUT_VENDOR)/etc/abox_debug.xml \
@@ -249,8 +243,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/init/vendor.samsung.hardware.gnss@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.samsung.hardware.gnss@1.0-service.rc \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/init/vendor.samsung.hardware.radio.configsvc@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.samsung.hardware.radio.configsvc@1.0-service.rc \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/init/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.samsung_slsi.hardware.ExynosHWCServiceTW@1.0-service.rc \
-    vendor/samsung/universal8895-common/proprietary/vendor/etc/init/vendor.trustonic.tee@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.trustonic.tee@1.0-service.rc \
-    vendor/samsung/universal8895-common/proprietary/vendor/etc/init/vendor.trustonic.teeregistry@1.0-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.trustonic.teeregistry@1.0-service.rc \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/init/wifi.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wifi.rc \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/init/wifi_brcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wifi_brcm.rc \
     vendor/samsung/universal8895-common/proprietary/vendor/etc/libnfc-sec-vendor.conf:$(TARGET_COPY_OUT_VENDOR)/etc/libnfc-sec-vendor.conf \
@@ -339,7 +331,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/libDLInterface.camera.samsung.so:$(TARGET_COPY_OUT_VENDOR)/lib/libDLInterface.camera.samsung.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/libExynosHWCService.so:$(TARGET_COPY_OUT_VENDOR)/lib/libExynosHWCService.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/libMcClient.so:$(TARGET_COPY_OUT_VENDOR)/lib/libMcClient.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib/libMcRegistry.so:$(TARGET_COPY_OUT_VENDOR)/lib/libMcRegistry.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/libOpenCv.camera.samsung.so:$(TARGET_COPY_OUT_VENDOR)/lib/libOpenCv.camera.samsung.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/libRSDriverArm.so:$(TARGET_COPY_OUT_VENDOR)/lib/libRSDriverArm.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib/lib_SoundAlive_3DPosition_ver202.so:$(TARGET_COPY_OUT_VENDOR)/lib/lib_SoundAlive_3DPosition_ver202.so \
@@ -418,7 +409,6 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libDLInterface.camera.samsung.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libDLInterface.camera.samsung.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libExynosHWCService.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libExynosHWCService.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libMcClient.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libMcClient.so \
-    vendor/samsung/universal8895-common/proprietary/vendor/lib64/libMcRegistry.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libMcRegistry.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libOpenCv.camera.samsung.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libOpenCv.camera.samsung.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libRSDriverArm.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libRSDriverArm.so \
     vendor/samsung/universal8895-common/proprietary/vendor/lib64/libbauthserver.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libbauthserver.so \