diff --git a/Android.bp b/Android.bp index 118a356..c8f4eff 100644 --- a/Android.bp +++ b/Android.bp @@ -1619,31 +1619,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libstork_shared", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libstork_shared.so", - ], - shared_libs: [ - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libswcnr", owner: "samsung", @@ -1819,33 +1794,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libvk_cass_interface", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libvk_cass_interface.so", - ], - shared_libs: [ - "libcutils", - "liblog", - "libvkmanager_vendor", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libvkmanager_vendor", owner: "samsung", @@ -1872,34 +1820,6 @@ cc_prebuilt_library_shared { soc_specific: true, } -cc_prebuilt_library_shared { - name: "libvkservice", - owner: "samsung", - strip: { - none: true, - }, - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/lib64/libvkservice.so", - ], - shared_libs: [ - "libcutils", - "liblog", - "libstork_shared", - "libteecl", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - prefer: true, - soc_specific: true, -} - cc_prebuilt_library_shared { name: "libwrappergps", owner: "samsung", @@ -2466,31 +2386,6 @@ prebuilt_etc_xml { soc_specific: true, } -cc_prebuilt_binary { - name: "cass", - owner: "samsung", - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/bin/cass", - ], - shared_libs: [ - "liblog", - "libc", - "libvk_cass_interface", - "libsecril-client", - "libengmode_client", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - soc_specific: true, -} - cc_prebuilt_binary { name: "epic", owner: "samsung", @@ -2755,61 +2650,6 @@ cc_prebuilt_binary { soc_specific: true, } -cc_prebuilt_binary { - name: "vaultkeeperd", - owner: "samsung", - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/bin/vaultkeeperd", - ], - shared_libs: [ - "libdsms_vendor", - "libvkservice", - "libcutils", - "liblog", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - soc_specific: true, -} - -cc_prebuilt_binary { - name: "vendor.samsung.hardware.security.proca@2.0-service", - owner: "samsung", - target: { - android_arm64: { - srcs: [ - "proprietary/vendor/bin/vendor.samsung.hardware.security.proca@2.0-service", - ], - shared_libs: [ - "libteecl", - "liblog", - "libutils", - "libc++", - "libc", - "libm", - "libdl", - ], - }, - }, - compile_multilib: "64", - strip: { - none: true, - }, - prefer: true, - soc_specific: true, -} - install_symlink { name: "vendor_lib64_libOpenCL_so", soc_specific: true, diff --git a/proprietary/vendor/app/mcRegistry/00060308060501020000000000000000.tabin b/proprietary/vendor/app/mcRegistry/00060308060501020000000000000000.tabin deleted file mode 100644 index 73d1a6f..0000000 Binary files a/proprietary/vendor/app/mcRegistry/00060308060501020000000000000000.tabin and /dev/null differ diff --git a/proprietary/vendor/app/mcRegistry/0706000000000000000000000000004d.tlbin b/proprietary/vendor/app/mcRegistry/0706000000000000000000000000004d.tlbin deleted file mode 100644 index 6e5daa3..0000000 Binary files a/proprietary/vendor/app/mcRegistry/0706000000000000000000000000004d.tlbin and /dev/null differ diff --git a/proprietary/vendor/bin/cass b/proprietary/vendor/bin/cass deleted file mode 100755 index ee46aaf..0000000 Binary files a/proprietary/vendor/bin/cass and /dev/null differ diff --git a/proprietary/vendor/bin/vaultkeeperd b/proprietary/vendor/bin/vaultkeeperd deleted file mode 100755 index db2efcb..0000000 Binary files a/proprietary/vendor/bin/vaultkeeperd and /dev/null differ diff --git a/proprietary/vendor/bin/vendor.samsung.hardware.security.proca@2.0-service b/proprietary/vendor/bin/vendor.samsung.hardware.security.proca@2.0-service deleted file mode 100755 index 26750bf..0000000 Binary files a/proprietary/vendor/bin/vendor.samsung.hardware.security.proca@2.0-service and /dev/null differ diff --git a/proprietary/vendor/etc/init/cass.rc b/proprietary/vendor/etc/init/cass.rc deleted file mode 100644 index e1e2880..0000000 --- a/proprietary/vendor/etc/init/cass.rc +++ /dev/null @@ -1,9 +0,0 @@ -service cass /vendor/bin/cass - class core - user system - group radio wakelock system - capabilities BLOCK_SUSPEND - disabled - -on post-fs-data - start cass diff --git a/proprietary/vendor/etc/init/pa_daemon_teegris.rc b/proprietary/vendor/etc/init/pa_daemon_teegris.rc deleted file mode 100644 index b186534..0000000 --- a/proprietary/vendor/etc/init/pa_daemon_teegris.rc +++ /dev/null @@ -1,13 +0,0 @@ -# Process Authenticator startup -service proca /vendor/bin/vendor.samsung.hardware.security.proca@2.0-service - class early_hal - user system - group system - disabled - -on property:vendor.tzdaemon=Ready - start proca - -on late-fs && property:vendor.tzdaemon=Ready - start proca - diff --git a/proprietary/vendor/etc/init/vaultkeeper_common.rc b/proprietary/vendor/etc/init/vaultkeeper_common.rc deleted file mode 100644 index 0807130..0000000 --- a/proprietary/vendor/etc/init/vaultkeeper_common.rc +++ /dev/null @@ -1,18 +0,0 @@ -# VaultKeeper -service vaultkeeper /vendor/bin/vaultkeeperd - class core - user system - group system - disabled - -service vaultkeeper_hal /vendor/bin/vendor.samsung.hardware.security.vaultkeeper@2.0-service - class early_hal - user system - group system - disabled - -on late-fs - # vaultkeeper - mkdir /dev/socket/vaultkeeper 0770 system system - start vaultkeeper - start vaultkeeper_hal diff --git a/proprietary/vendor/lib64/libstork_shared.so b/proprietary/vendor/lib64/libstork_shared.so deleted file mode 100644 index 5c72215..0000000 Binary files a/proprietary/vendor/lib64/libstork_shared.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libvk_cass_interface.so b/proprietary/vendor/lib64/libvk_cass_interface.so deleted file mode 100644 index ae2d43a..0000000 Binary files a/proprietary/vendor/lib64/libvk_cass_interface.so and /dev/null differ diff --git a/proprietary/vendor/lib64/libvkmanager_vendor.so b/proprietary/vendor/lib64/libvkmanager_vendor.so index 21eaa51..5076c61 100644 Binary files a/proprietary/vendor/lib64/libvkmanager_vendor.so and b/proprietary/vendor/lib64/libvkmanager_vendor.so differ diff --git a/proprietary/vendor/lib64/libvkservice.so b/proprietary/vendor/lib64/libvkservice.so deleted file mode 100644 index 08a827e..0000000 Binary files a/proprietary/vendor/lib64/libvkservice.so and /dev/null differ diff --git a/s5e8825-common-vendor.mk b/s5e8825-common-vendor.mk index c554102..d6ac2c9 100644 --- a/s5e8825-common-vendor.mk +++ b/s5e8825-common-vendor.mk @@ -6,8 +6,6 @@ PRODUCT_SOONG_NAMESPACES += \ vendor/samsung/s5e8825-common PRODUCT_COPY_FILES += \ - vendor/samsung/s5e8825-common/proprietary/vendor/app/mcRegistry/00060308060501020000000000000000.tabin:$(TARGET_COPY_OUT_VENDOR)/app/mcRegistry/00060308060501020000000000000000.tabin \ - vendor/samsung/s5e8825-common/proprietary/vendor/app/mcRegistry/0706000000000000000000000000004d.tlbin:$(TARGET_COPY_OUT_VENDOR)/app/mcRegistry/0706000000000000000000000000004d.tlbin \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/SoundBoosterParam.txt:$(TARGET_COPY_OUT_VENDOR)/etc/SoundBoosterParam.txt \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/dolby/dax-default.xml:$(TARGET_COPY_OUT_VENDOR)/etc/dolby/dax-default.xml \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/ems.json:$(TARGET_COPY_OUT_VENDOR)/etc/ems.json \ @@ -17,12 +15,9 @@ PRODUCT_COPY_FILES += \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/gnss/gps.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cfg \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/android.hardware.drm-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm-service.widevine.rc \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/android.hardware.security.keymint-service.samsung.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.security.keymint-service.samsung.rc \ - vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/cass.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cass.rc \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/init.nfc.samsung.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.nfc.samsung.rc \ - vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/pa_daemon_teegris.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/pa_daemon_teegris.rc \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/secaudiohalaidl.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/secaudiohalaidl.rc \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/teegris_v4.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/teegris_v4.rc \ - vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/vaultkeeper_common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vaultkeeper_common.rc \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/vendor.samsung.hardware.gnss@2.1-service.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.samsung.hardware.gnss@2.1-service.rc \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/vendor.samsung.rild.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.samsung.rild.rc \ vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/wifi_slsi.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wifi_slsi.rc \ @@ -111,7 +106,6 @@ PRODUCT_PACKAGES += \ libskeymint_cli \ libspatializerparamstorage \ libspeakercalibration \ - libstork_shared \ libswcnr \ libsynaFpSensorTestNwd \ libteecl \ @@ -119,9 +113,7 @@ PRODUCT_PACKAGES += \ libuniapi \ libuniplugin \ libuuid_vendor \ - libvk_cass_interface \ libvkmanager_vendor \ - libvkservice \ libwrappergps \ libwvaidl \ sensors.grip \ @@ -145,7 +137,6 @@ PRODUCT_PACKAGES += \ vendor.samsung.hardware.radio.exclude.slsi.xml \ vendor.samsung.hardware.radio_manifest_2_34.xml \ vendor.samsung.hardware.sehradio_manifest_2_34.xml \ - cass \ epic \ android.hardware.drm-service.widevine \ android.hardware.security.keymint-service.samsung \ @@ -155,9 +146,7 @@ PRODUCT_PACKAGES += \ secaudiohalaidl \ vendor.samsung.hardware.gnss@2.1-service \ tzdaemon \ - tzts_daemon \ - vaultkeeperd \ - vendor.samsung.hardware.security.proca@2.0-service + tzts_daemon PRODUCT_PACKAGES += \ vendor_lib64_libOpenCL_so \