exynos9820-common: Switch to f62 T RIL stack
Change-Id: Ic1444a10b68555cd745c5191088127fa5cf9a27c
diff --git a/Android.bp b/Android.bp
index c1d28a2..055973d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -3,6 +3,8 @@
// This file is generated by device/samsung/exynos9820-common/setup-makefiles.sh
soong_namespace {
+ imports: [
+ ],
}
cc_prebuilt_library_shared {
@@ -354,6 +356,40 @@
}
cc_prebuilt_library_shared {
+ name: "libSemDataProps",
+ owner: "samsung",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: ["proprietary/vendor/lib64/libSemDataProps.so"],
+ },
+ },
+ compile_multilib: "64",
+ check_elf_files: false,
+ prefer: true,
+ soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
+ name: "libSemTelephonyProps",
+ owner: "samsung",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: ["proprietary/vendor/lib64/libSemTelephonyProps.so"],
+ },
+ },
+ compile_multilib: "64",
+ check_elf_files: false,
+ prefer: true,
+ soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
name: "libengmode_client",
owner: "samsung",
strip: {
@@ -456,31 +492,14 @@
}
cc_prebuilt_library_shared {
- name: "libril-samsung",
+ name: "libril_sem",
owner: "samsung",
strip: {
none: true,
},
target: {
android_arm64: {
- srcs: ["proprietary/vendor/lib64/libril-samsung.so"],
- },
- },
- compile_multilib: "64",
- check_elf_files: false,
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "libsec-ril-dsds",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: ["proprietary/vendor/lib64/libsec-ril-dsds.so"],
+ srcs: ["proprietary/vendor/lib64/libril_sem.so"],
},
},
compile_multilib: "64",
@@ -541,6 +560,23 @@
}
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: {
@@ -575,6 +611,23 @@
}
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: {
@@ -609,6 +662,23 @@
}
cc_prebuilt_library_shared {
+ name: "vendor.samsung.hardware.radio.bridge@2.1",
+ owner: "samsung",
+ strip: {
+ none: true,
+ },
+ target: {
+ android_arm64: {
+ srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so"],
+ },
+ },
+ compile_multilib: "64",
+ check_elf_files: false,
+ prefer: true,
+ soc_specific: true,
+}
+
+cc_prebuilt_library_shared {
name: "vendor.samsung.hardware.radio.channel@2.0",
owner: "samsung",
strip: {
@@ -625,40 +695,6 @@
soc_specific: true,
}
-cc_prebuilt_library_shared {
- name: "vendor.samsung.hardware.radio@2.0",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio@2.0.so"],
- },
- },
- compile_multilib: "64",
- check_elf_files: false,
- prefer: true,
- soc_specific: true,
-}
-
-cc_prebuilt_library_shared {
- name: "vendor.samsung.hardware.radio@2.1",
- owner: "samsung",
- strip: {
- none: true,
- },
- target: {
- android_arm64: {
- srcs: ["proprietary/vendor/lib64/vendor.samsung.hardware.radio@2.1.so"],
- },
- },
- compile_multilib: "64",
- check_elf_files: false,
- prefer: true,
- soc_specific: true,
-}
-
prebuilt_etc_xml {
name: "manifest_android.hardware.drm@1.4-service.widevine",
owner: "samsung",
@@ -669,9 +705,31 @@
}
cc_prebuilt_binary {
+ name: "cass",
+ owner: "samsung",
+ target: {
+ android_arm64: {
+ srcs: ["proprietary/vendor/bin/cass"],
+ },
+ },
+ compile_multilib: "64",
+ check_elf_files: false,
+ strip: {
+ none: true,
+ },
+ prefer: true,
+ soc_specific: true,
+}
+
+cc_prebuilt_binary {
name: "cbd",
owner: "samsung",
- srcs: ["proprietary/vendor/bin/cbd"],
+ target: {
+ android_arm64: {
+ srcs: ["proprietary/vendor/bin/cbd"],
+ },
+ },
+ compile_multilib: "64",
check_elf_files: false,
strip: {
none: true,
@@ -683,7 +741,12 @@
cc_prebuilt_binary {
name: "android.hardware.drm@1.4-service.widevine",
owner: "samsung",
- srcs: ["proprietary/vendor/bin/hw/android.hardware.drm@1.4-service.widevine"],
+ target: {
+ android_arm: {
+ srcs: ["proprietary/vendor/bin/hw/android.hardware.drm@1.4-service.widevine"],
+ },
+ },
+ compile_multilib: "32",
check_elf_files: false,
strip: {
none: true,
@@ -696,7 +759,12 @@
cc_prebuilt_binary {
name: "rild",
owner: "samsung",
- srcs: ["proprietary/vendor/bin/hw/rild"],
+ target: {
+ android_arm64: {
+ srcs: ["proprietary/vendor/bin/hw/rild"],
+ },
+ },
+ compile_multilib: "64",
check_elf_files: false,
strip: {
none: true,
@@ -709,7 +777,12 @@
cc_prebuilt_binary {
name: "tzdaemon",
owner: "samsung",
- srcs: ["proprietary/vendor/bin/tzdaemon"],
+ target: {
+ android_arm64: {
+ srcs: ["proprietary/vendor/bin/tzdaemon"],
+ },
+ },
+ compile_multilib: "64",
check_elf_files: false,
strip: {
none: true,
@@ -721,7 +794,29 @@
cc_prebuilt_binary {
name: "tzts_daemon",
owner: "samsung",
- srcs: ["proprietary/vendor/bin/tzts_daemon"],
+ target: {
+ android_arm64: {
+ srcs: ["proprietary/vendor/bin/tzts_daemon"],
+ },
+ },
+ compile_multilib: "64",
+ check_elf_files: false,
+ strip: {
+ none: true,
+ },
+ prefer: true,
+ 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,
diff --git a/Android.mk b/Android.mk
index 5515218..23cb832 100644
--- a/Android.mk
+++ b/Android.mk
@@ -4,6 +4,6 @@
LOCAL_PATH := $(call my-dir)
-ifneq ($(filter beyond0lte beyond1lte beyond2lte beyondx d1 d2s d2x f62,$(TARGET_DEVICE)),)
+ifneq ($(filter beyond0lte beyond1lte beyond2lte beyondx d1 d1x d2s d2x f62,$(TARGET_DEVICE)),)
endif
diff --git a/exynos9820-common-vendor.mk b/exynos9820-common-vendor.mk
index 81c0a6d..cf868f8 100644
--- a/exynos9820-common-vendor.mk
+++ b/exynos9820-common-vendor.mk
@@ -12,9 +12,11 @@
vendor/samsung/exynos9820-common/proprietary/vendor/etc/default_volume_tables.xml:$(TARGET_COPY_OUT_VENDOR)/etc/default_volume_tables.xml \
vendor/samsung/exynos9820-common/proprietary/vendor/etc/gnss/gps.cer:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cer \
vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.4-service.widevine.rc \
- vendor/samsung/exynos9820-common/proprietary/vendor/etc/init/init.vendor.rilchip.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.vendor.rilchip.rc \
+ 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.sem.rilchip.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/vendor.sem.rilchip.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 \
vendor/samsung/exynos9820-common/proprietary/vendor/etc/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \
@@ -95,27 +97,31 @@
libsecaudiocoreutils \
libwvhidl \
libSEF.quram \
+ libSemDataProps \
+ libSemTelephonyProps \
libengmode_client \
libflicker_sec \
libfloatingfeature \
libhwjsqz \
libiwt \
libkeymaster_helper \
- libril-samsung \
- libsec-ril-dsds \
+ libril_sem \
libsec-ril \
libsensorlistener \
libskeymaster4device \
+ libstork_shared \
libuniapi \
libvkmanager_vendor \
+ libvkservice \
vendor.samsung.hardware.gnss@2.0 \
vendor.samsung.hardware.radio.bridge@2.0 \
+ vendor.samsung.hardware.radio.bridge@2.1 \
vendor.samsung.hardware.radio.channel@2.0 \
- vendor.samsung.hardware.radio@2.0 \
- vendor.samsung.hardware.radio@2.1 \
manifest_android.hardware.drm@1.4-service.widevine \
+ cass \
cbd \
android.hardware.drm@1.4-service.widevine \
rild \
tzdaemon \
- tzts_daemon
+ tzts_daemon \
+ vaultkeeperd
diff --git a/proprietary/vendor/bin/cass b/proprietary/vendor/bin/cass
new file mode 100755
index 0000000..b66aeef
--- /dev/null
+++ b/proprietary/vendor/bin/cass
Binary files differ
diff --git a/proprietary/vendor/bin/hw/rild b/proprietary/vendor/bin/hw/rild
index 075dc52..d1b2dbb 100644
--- a/proprietary/vendor/bin/hw/rild
+++ b/proprietary/vendor/bin/hw/rild
Binary files differ
diff --git a/proprietary/vendor/bin/vaultkeeperd b/proprietary/vendor/bin/vaultkeeperd
new file mode 100755
index 0000000..9a5ff2a
--- /dev/null
+++ b/proprietary/vendor/bin/vaultkeeperd
Binary files differ
diff --git a/proprietary/vendor/etc/init/cass.rc b/proprietary/vendor/etc/init/cass.rc
new file mode 100644
index 0000000..e1e2880
--- /dev/null
+++ b/proprietary/vendor/etc/init/cass.rc
@@ -0,0 +1,9 @@
+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/vaultkeeper_common.rc b/proprietary/vendor/etc/init/vaultkeeper_common.rc
new file mode 100644
index 0000000..0807130
--- /dev/null
+++ b/proprietary/vendor/etc/init/vaultkeeper_common.rc
@@ -0,0 +1,18 @@
+# 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/etc/init/init.vendor.rilchip.rc b/proprietary/vendor/etc/init/vendor.sem.rilchip.rc
similarity index 70%
rename from proprietary/vendor/etc/init/init.vendor.rilchip.rc
rename to proprietary/vendor/etc/init/vendor.sem.rilchip.rc
index 6308482..bf44bc2 100644
--- a/proprietary/vendor/etc/init/init.vendor.rilchip.rc
+++ b/proprietary/vendor/etc/init/vendor.sem.rilchip.rc
@@ -13,14 +13,7 @@
onrestart restart cpboot-daemon
onrestart restart cpboot-daemon5g
onrestart restart DIAG-daemon
-
-service ril-daemon1 /vendor/bin/hw/rild -c 2
- class main
- user radio
- group radio cache inet misc audio sdcard_r sdcard_rw log vpn system readproc wakelock
- capabilities BLOCK_SUSPEND NET_ADMIN NET_RAW SYS_ADMIN CHOWN SYS_TIME
- onrestart restart cpboot-daemon
- onrestart restart DIAG-daemon
+ override
# LSI CDMA project daemon support dun function
service VC-daemon /vendor/bin/vcd
@@ -28,4 +21,5 @@
user root
group system
disabled
- seclabel u:r:vcd:s0
\ No newline at end of file
+ seclabel u:r:vcd:s0
+ override
\ No newline at end of file
diff --git a/proprietary/vendor/lib/libsecril-client.so b/proprietary/vendor/lib/libsecril-client.so
index 7eb3f1e..6474843 100644
--- a/proprietary/vendor/lib/libsecril-client.so
+++ b/proprietary/vendor/lib/libsecril-client.so
Binary files differ
diff --git a/proprietary/vendor/lib/libsemnativecarrierfeature.so b/proprietary/vendor/lib/libsemnativecarrierfeature.so
index 853f0b0..8eba07d 100644
--- a/proprietary/vendor/lib/libsemnativecarrierfeature.so
+++ b/proprietary/vendor/lib/libsemnativecarrierfeature.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libSemDataProps.so b/proprietary/vendor/lib64/libSemDataProps.so
new file mode 100644
index 0000000..c8dd104
--- /dev/null
+++ b/proprietary/vendor/lib64/libSemDataProps.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libSemTelephonyProps.so b/proprietary/vendor/lib64/libSemTelephonyProps.so
new file mode 100644
index 0000000..da19b76
--- /dev/null
+++ b/proprietary/vendor/lib64/libSemTelephonyProps.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libril-samsung.so b/proprietary/vendor/lib64/libril-samsung.so
deleted file mode 100644
index 8d03ca4..0000000
--- a/proprietary/vendor/lib64/libril-samsung.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/lib64/libril_sem.so b/proprietary/vendor/lib64/libril_sem.so
new file mode 100644
index 0000000..7c572a6
--- /dev/null
+++ b/proprietary/vendor/lib64/libril_sem.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libsec-ril-dsds.so b/proprietary/vendor/lib64/libsec-ril-dsds.so
deleted file mode 100644
index 08cba94..0000000
--- a/proprietary/vendor/lib64/libsec-ril-dsds.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/lib64/libsec-ril.so b/proprietary/vendor/lib64/libsec-ril.so
index 1ae03f2..35a86af 100644
--- a/proprietary/vendor/lib64/libsec-ril.so
+++ b/proprietary/vendor/lib64/libsec-ril.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libsecril-client.so b/proprietary/vendor/lib64/libsecril-client.so
index 306b5d5..467b0b0 100644
--- a/proprietary/vendor/lib64/libsecril-client.so
+++ b/proprietary/vendor/lib64/libsecril-client.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libsemnativecarrierfeature.so b/proprietary/vendor/lib64/libsemnativecarrierfeature.so
index ab7c348..ebdeb64 100644
--- a/proprietary/vendor/lib64/libsemnativecarrierfeature.so
+++ b/proprietary/vendor/lib64/libsemnativecarrierfeature.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libstork_shared.so b/proprietary/vendor/lib64/libstork_shared.so
new file mode 100644
index 0000000..5c72215
--- /dev/null
+++ b/proprietary/vendor/lib64/libstork_shared.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libvkservice.so b/proprietary/vendor/lib64/libvkservice.so
new file mode 100644
index 0000000..9d786df
--- /dev/null
+++ b/proprietary/vendor/lib64/libvkservice.so
Binary files differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so
index 28d744d..79e8497 100644
--- a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.0.so
Binary files differ
diff --git a/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so
new file mode 100644
index 0000000..c56f2ba
--- /dev/null
+++ b/proprietary/vendor/lib64/vendor.samsung.hardware.radio.bridge@2.1.so
Binary files differ