universal9830: Switch to a55x RIL Stack

Change-Id: I9c9104d3bc450cc5f5228017bfc063bc58ded5b0
Signed-off-by: ExtremeXT <extremextdev@gmail.com>

Android.bp

@@ -648,7 +648,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "libSemDataProps",
+    name: "libVendorSemDataProps",
     owner: "samsung",
     strip: {
         none: true,
@@ -656,7 +656,7 @@ cc_prebuilt_library_shared {
     target: {
         android_arm64: {
             srcs: [
-                "proprietary/vendor/lib64/libSemDataProps.so",
+                "proprietary/vendor/lib64/libVendorSemDataProps.so",
             ],
             shared_libs: [
                 "liblog",
@@ -673,7 +673,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "libSemTelephonyProps",
+    name: "libVendorSemTelephonyProps",
     owner: "samsung",
     strip: {
         none: true,
@@ -681,7 +681,7 @@ cc_prebuilt_library_shared {
     target: {
         android_arm64: {
             srcs: [
-                "proprietary/vendor/lib64/libSemTelephonyProps.so",
+                "proprietary/vendor/lib64/libVendorSemTelephonyProps.so",
             ],
             shared_libs: [
                 "liblog",
@@ -1999,19 +1999,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.config-V2-ndk",
-                "android.hardware.radio.data-V1-ndk",
+                "android.hardware.radio.data-V2-ndk",
-                "android.hardware.radio.messaging-V1-ndk",
+                "android.hardware.radio.messaging-V2-ndk",
-                "android.hardware.radio.modem-V1-ndk",
+                "android.hardware.radio.modem-V2-ndk",
-                "android.hardware.radio.network-V1-ndk",
+                "android.hardware.radio.network-V2-ndk",
-                "android.hardware.radio.sim-V1-ndk",
+                "android.hardware.radio.sap-V1-ndk",
-                "android.hardware.radio.voice-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",
@@ -2022,6 +2019,7 @@ cc_prebuilt_library_shared {
                 "liblog",
                 "librilutils",
                 "libutils",
+                "libfloatingfeature",
                 "libc++",
                 "libc",
                 "libm",
@@ -2083,8 +2081,9 @@ cc_prebuilt_library_shared {
                 "libz",
                 "libutils",
                 "libjsoncpp",
-                "libSemTelephonyProps",
+                "libVendorSemTelephonyProps",
-                "libSemDataProps",
+                "libVendorSemDataProps",
+                "libprotobuf-cpp-full",
                 "libvkmanager_vendor",
                 "libengmode_client",
                 "libbase",
@@ -2094,7 +2093,6 @@ cc_prebuilt_library_shared {
                 "libfloatingfeature",
                 "libsemnativecarrierfeature",
                 "libc++",
-                "libprotobuf-cpp-full-3.9.1-vendorcompat",
                 "libc",
                 "libm",
                 "libdl",
@@ -2728,18 +2726,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,

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>

universal9830-common-vendor.mk

@@ -117,8 +117,8 @@ PRODUCT_PACKAGES += \
     gps.default \
     vendor.samsung.hardware.gnss@2.1-impl \
     libSEF.quram \
-    libSemDataProps \
+    libVendorSemDataProps \
-    libSemTelephonyProps \
+    libVendorSemTelephonyProps \
     libbayergdccore \
     libcommon \
     libcrane_compiler \
@@ -192,8 +192,8 @@ PRODUCT_PACKAGES += \
     com.android.hotwordenrollment.common.util \
     manifest_android.hardware.drm@1.3-service.widevine.xml \
     vendor.samsung.hardware.radio.exclude.slsi.xml \
-    vendor.samsung.hardware.radio_manifest_2_33.xml \
+    vendor.samsung.hardware.radio_manifest_2_34.xml \
-    vendor.samsung.hardware.sehradio_manifest_2_33.xml \
+    vendor.samsung.hardware.sehradio_manifest_2_34.xml \
     cass \
     android.hardware.drm@1.3-service.widevine \
     android.hardware.keymaster@4.0_strongbox-service \