exynos9820-common: Decommonize vaultkeeper
Change-Id: Ia9339f01b025d9a88600ed20a936f2c134aa557c
diff --git a/Android.bp b/Android.bp
index 7922d68..1e287c0 100644
--- a/Android.bp
+++ b/Android.bp
@@ -560,23 +560,6 @@
}
cc_prebuilt_library_shared {
- name: "libstork_shared",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: ["proprietary/vendor/lib64/libstork_shared.so"],
- },
- },
- compile_multilib: "64",
- check_elf_files: false,
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
name: "libuniapi",
owner: "samsung",
strip: {
@@ -594,40 +577,6 @@
}
cc_prebuilt_library_shared {
- name: "libvkmanager_vendor",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: ["proprietary/vendor/lib64/libvkmanager_vendor.so"],
- },
- },
- compile_multilib: "64",
- check_elf_files: false,
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libvkservice",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: ["proprietary/vendor/lib64/libvkservice.so"],
- },
- },
- compile_multilib: "64",
- check_elf_files: false,
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
name: "vendor.samsung.hardware.gnss@2.0",
owner: "samsung",
strip: {
@@ -886,23 +835,6 @@
soc_specific: true,
}
-cc_prebuilt_binary {
- name: "vaultkeeperd",
- owner: "samsung",
- target: {
- android_arm64: {
- srcs: ["proprietary/vendor/bin/vaultkeeperd"],
- },
- },
- compile_multilib: "64",
- check_elf_files: false,
- strip: {
- none: true,
- },
- prefer: true,
- soc_specific: true,
-}
-
install_symlink {
name: "libGLES_mali_libOpenCL_symlink32",
soc_specific: true,
diff --git a/exynos9820-common-vendor.mk b/exynos9820-common-vendor.mk
index cf19231..1550b3c 100644
--- a/exynos9820-common-vendor.mk
+++ b/exynos9820-common-vendor.mk
@@ -15,7 +15,6 @@
vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/cass.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cass.rc \
vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/init.vendor.rilcommon.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.vendor.rilcommon.rc \
vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/teegris_v3.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/teegris_v3.rc \
- vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/vaultkeeper_common.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vaultkeeper_common.rc \
vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/vendor.samsung.rilchip.slsi.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.samsung.rilchip.slsi.rc \
vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/wifi.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wifi.rc \
vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/wifi_brcm.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/wifi_brcm.rc \
@@ -67,7 +66,6 @@
vendor/samsung/exynos9820-common/proprietary/vendor/tee/00000000-0000-0000-0000-53454d655345:$(TARGET_COPY_OUT_VENDOR)/tee/00000000-0000-0000-0000-53454d655345 \
vendor/samsung/exynos9820-common/proprietary/vendor/tee/00000000-0000-0000-0000-535355504341:$(TARGET_COPY_OUT_VENDOR)/tee/00000000-0000-0000-0000-535355504341 \
vendor/samsung/exynos9820-common/proprietary/vendor/tee/00000000-0000-0000-0000-5354494d4552:$(TARGET_COPY_OUT_VENDOR)/tee/00000000-0000-0000-0000-5354494d4552 \
- vendor/samsung/exynos9820-common/proprietary/vendor/tee/00000000-0000-0000-0000-564c544b5052:$(TARGET_COPY_OUT_VENDOR)/tee/00000000-0000-0000-0000-564c544b5052 \
vendor/samsung/exynos9820-common/proprietary/vendor/tee/00000000-0000-0000-0000-64756c444152:$(TARGET_COPY_OUT_VENDOR)/tee/00000000-0000-0000-0000-64756c444152 \
vendor/samsung/exynos9820-common/proprietary/vendor/tee/00000000-0000-0000-0000-656e676d6f64:$(TARGET_COPY_OUT_VENDOR)/tee/00000000-0000-0000-0000-656e676d6f64 \
vendor/samsung/exynos9820-common/proprietary/vendor/tee/00000000-0000-0000-0000-657365636f6d:$(TARGET_COPY_OUT_VENDOR)/tee/00000000-0000-0000-0000-657365636f6d \
@@ -109,10 +107,7 @@
libsec-ril \
libsensorlistener \
libskeymaster4device \
- libstork_shared \
libuniapi \
- libvkmanager_vendor \
- libvkservice \
vendor.samsung.hardware.gnss@2.0 \
vendor.samsung.hardware.radio-V1-ndk \
vendor.samsung.hardware.radio.bridge-V1-ndk \
@@ -129,8 +124,7 @@
android.hardware.drm@1.4-service.widevine \
rild \
tzdaemon \
- tzts_daemon \
- vaultkeeperd
+ tzts_daemon
PRODUCT_PACKAGES += \
libGLES_mali_libOpenCL_symlink32 \
diff --git a/proprietary/vendor/bin/vaultkeeperd b/proprietary/vendor/bin/vaultkeeperd
deleted file mode 100755
index 9a5ff2a..0000000
--- a/proprietary/vendor/bin/vaultkeeperd
+++ /dev/null
Binary files differ
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
--- a/proprietary/vendor/lib64/libstork_shared.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/lib64/libvkmanager_vendor.so b/proprietary/vendor/lib64/libvkmanager_vendor.so
deleted file mode 100644
index 8a4ea93..0000000
--- a/proprietary/vendor/lib64/libvkmanager_vendor.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/lib64/libvkservice.so b/proprietary/vendor/lib64/libvkservice.so
deleted file mode 100644
index 9d786df..0000000
--- a/proprietary/vendor/lib64/libvkservice.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/tee/00000000-0000-0000-0000-564c544b5052 b/proprietary/vendor/tee/00000000-0000-0000-0000-564c544b5052
deleted file mode 100644
index b14bcbf..0000000
--- a/proprietary/vendor/tee/00000000-0000-0000-0000-564c544b5052
+++ /dev/null
Binary files differ