s5e8825-common: Kang RIL from a55x

Change-Id: I819301c405da912a41a578dcf2920727bc7ea6a3
Signed-off-by: Majaahh <maja.blaszczak@proton.me>

Android.bp

@@ -1085,6 +1085,32 @@ cc_prebuilt_library_shared {
     soc_specific: true,
 }
 
+cc_prebuilt_library_shared {
+    name: "libprotobuf-cpp-full-21.7",
+    owner: "samsung",
+    strip: {
+        none: true,
+    },
+    target: {
+        android_arm64: {
+            srcs: [
+                "proprietary/vendor/lib64/libprotobuf-cpp-full-21.7.so",
+            ],
+            shared_libs: [
+                "libz",
+                "liblog",
+                "libc++",
+                "libc",
+                "libm",
+                "libdl",
+            ],
+        },
+    },
+    compile_multilib: "64",
+    prefer: true,
+    soc_specific: true,
+}
+
 cc_prebuilt_library_shared {
     name: "libqfp_sensortest",
     owner: "samsung",
@@ -1153,19 +1179,16 @@ cc_prebuilt_library_shared {
                 "proprietary/vendor/lib64/libril_sem.so",
             ],
             shared_libs: [
-                "libhidlbase",
-                "android.hardware.radio@1.0",
-                "android.hardware.radio@1.1",
-                "android.hardware.radio@1.2",
                 "libbase",
                 "libbinder_ndk",
-                "android.hardware.radio.config-V1-ndk",
-                "android.hardware.radio.data-V1-ndk",
-                "android.hardware.radio.messaging-V1-ndk",
-                "android.hardware.radio.modem-V1-ndk",
-                "android.hardware.radio.network-V1-ndk",
-                "android.hardware.radio.sim-V1-ndk",
-                "android.hardware.radio.voice-V1-ndk",
+                "android.hardware.radio.config-V2-ndk",
+                "android.hardware.radio.data-V2-ndk",
+                "android.hardware.radio.messaging-V2-ndk",
+                "android.hardware.radio.modem-V2-ndk",
+                "android.hardware.radio.network-V2-ndk",
+                "android.hardware.radio.sap-V1-ndk",
+                "android.hardware.radio.sim-V2-ndk",
+                "android.hardware.radio.voice-V2-ndk",
                 "vendor.samsung.hardware.radio.bridge-V1-ndk",
                 "vendor.samsung.hardware.radio.data-V1-ndk",
                 "vendor.samsung.hardware.radio.messaging-V1-ndk",
@@ -1215,7 +1238,7 @@ cc_prebuilt_library_shared {
                 "libjsoncpp",
                 "libVendorSemTelephonyProps",
                 "libVendorSemDataProps",
-                "libprotobuf-cpp-full-3.9.1-vendorcompat",
+                "libprotobuf-cpp-full-21.7",
                 "libvkmanager_vendor",
                 "libengmode_client",
                 "libbase",
@@ -1796,6 +1819,33 @@ 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",
@@ -2399,18 +2449,18 @@ prebuilt_etc_xml {
 }
 
 prebuilt_etc_xml {
-    name: "vendor.samsung.hardware.radio_manifest_2_33.xml",
+    name: "vendor.samsung.hardware.radio_manifest_2_34.xml",
     owner: "samsung",
-    src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_33.xml",
+    src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_34.xml",
     filename_from_src: true,
     sub_dir: "vintf/manifest",
     soc_specific: true,
 }
 
 prebuilt_etc_xml {
-    name: "vendor.samsung.hardware.sehradio_manifest_2_33.xml",
+    name: "vendor.samsung.hardware.sehradio_manifest_2_34.xml",
     owner: "samsung",
-    src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_33.xml",
+    src: "proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.sehradio_manifest_2_34.xml",
     filename_from_src: true,
     sub_dir: "vintf/manifest",
     soc_specific: true,
@@ -2425,15 +2475,11 @@ cc_prebuilt_binary {
                 "proprietary/vendor/bin/cass",
             ],
             shared_libs: [
-                "libengmode_client",
-                "libvkmanager_vendor",
-                "libsecril-client",
-                "libcutils",
                 "liblog",
-                "libc++",
                 "libc",
-                "libm",
-                "libdl",
+                "libvk_cass_interface",
+                "libsecril-client",
+                "libengmode_client",
             ],
         },
     },

proprietary/vendor/etc/vintf/manifest/vendor.samsung.hardware.radio_manifest_2_34.xml

@@ -7,19 +7,16 @@
         <name>android.hardware.radio</name>
         <transport>hwbinder</transport>
     </hal>
-    <hal override="true" format="hidl">
-        <name>android.hardware.radio</name>
-        <transport>hwbinder</transport>
-        <fqname>@1.2::ISap/slot1</fqname>
-        <fqname>@1.2::ISap/slot2</fqname>
-    </hal>
     <hal override="true" format="hidl">
         <name>android.hardware.radio.config</name>
         <transport>hwbinder</transport>
     </hal>
+    <hal override="true" format="aidl">
+        <name>android.hardware.radio.ims</name>
+    </hal>
     <hal override="true" format="aidl">
         <name>android.hardware.radio.modem</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IRadioModem</name>
             <instance>slot1</instance>
@@ -28,7 +25,7 @@
     </hal>
     <hal override="true" format="aidl">
         <name>android.hardware.radio.network</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IRadioNetwork</name>
             <instance>slot1</instance>
@@ -37,7 +34,7 @@
     </hal>
     <hal override="true" format="aidl">
         <name>android.hardware.radio.voice</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IRadioVoice</name>
             <instance>slot1</instance>
@@ -46,7 +43,7 @@
     </hal>
     <hal override="true" format="aidl">
         <name>android.hardware.radio.config</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IRadioConfig</name>
             <instance>default</instance>
@@ -54,7 +51,7 @@
     </hal>
     <hal override="true" format="aidl">
         <name>android.hardware.radio.sim</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IRadioSim</name>
             <instance>slot1</instance>
@@ -63,7 +60,7 @@
     </hal>
     <hal override="true" format="aidl">
         <name>android.hardware.radio.data</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IRadioData</name>
             <instance>slot1</instance>
@@ -72,11 +69,20 @@
     </hal>
     <hal override="true" format="aidl">
         <name>android.hardware.radio.messaging</name>
-        <version>1</version>
+        <version>2</version>
         <interface>
             <name>IRadioMessaging</name>
             <instance>slot1</instance>
             <instance>slot2</instance>
         </interface>
     </hal>
+    <hal override="true" format="aidl">
+        <name>android.hardware.radio.sap</name>
+        <version>1</version>
+        <interface>
+            <name>ISap</name>
+            <instance>slot1</instance>
+            <instance>slot2</instance>
+        </interface>
+    </hal>
 </manifest>

s5e8825-common-vendor.mk

@@ -94,6 +94,7 @@ PRODUCT_PACKAGES += \
     liblastaboxmsg \
     liboemcrypto \
     libprofileparamstorage \
+    libprotobuf-cpp-full-21.7 \
     libqfp_sensortest \
     librecordalive \
     libril_sem \
@@ -118,6 +119,7 @@ PRODUCT_PACKAGES += \
     libuniapi \
     libuniplugin \
     libuuid_vendor \
+    libvk_cass_interface \
     libvkmanager_vendor \
     libvkservice \
     libwrappergps \
@@ -141,8 +143,8 @@ PRODUCT_PACKAGES += \
     manifest_android.hardware.drm-service.widevine.xml \
     secaudiohalaidl_manifest.xml \
     vendor.samsung.hardware.radio.exclude.slsi.xml \
-    vendor.samsung.hardware.radio_manifest_2_33.xml \
-    vendor.samsung.hardware.sehradio_manifest_2_33.xml \
+    vendor.samsung.hardware.radio_manifest_2_34.xml \
+    vendor.samsung.hardware.sehradio_manifest_2_34.xml \
     cass \
     epic \
     android.hardware.drm-service.widevine \