commit 4c02c3671f156ed3f7053fea6a4b733c25bb3a63
author Jorge E. Moreira <jemoreira@google.com> Wed Feb 06 17:16:42 2019 -0800
committer Jorge E. Moreira <jemoreira@google.com> Thu Feb 07 14:03:54 2019 -0800
tree 3ec379c5824bd55e0514bc3901b884fdf07a533f
parent f4b202bef8e7503402608d97e353b32184188c77

Rename libvsoc-ril as libcuttlefish-ril

Bug: 124012805
Test: build
Change-Id: I6aead11d9a901830db34f379b3fba22860f28d67

guest/hals/ril/Android.mk

diff --git a/guest/hals/ril/Android.mk b/guest/hals/ril/Android.mk
index 56e9779..08e3637 100644
--- a/guest/hals/ril/Android.mk
+++ b/guest/hals/ril/Android.mk
@@ -17,7 +17,7 @@
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
-  vsoc_ril.cpp
+  cuttlefish_ril.cpp
 
 LOCAL_SHARED_LIBRARIES := \
   liblog \
@@ -39,7 +39,7 @@
   -Werror \
   $(VSOC_VERSION_CFLAGS)
 
-LOCAL_MODULE:= libvsoc-ril
+LOCAL_MODULE:= libcuttlefish-ril
 LOCAL_MODULE_TAGS := optional
 LOCAL_VENDOR_MODULE := true
 

guest/hals/ril/cuttlefish_ril.cpp

diff --git a/guest/hals/ril/vsoc_ril.cpp b/guest/hals/ril/cuttlefish_ril.cpp
similarity index 99%
rename from guest/hals/ril/vsoc_ril.cpp
rename to guest/hals/ril/cuttlefish_ril.cpp
index e332de9..80de442 100644
--- a/guest/hals/ril/vsoc_ril.cpp
+++ b/guest/hals/ril/cuttlefish_ril.cpp
@@ -14,7 +14,7 @@
 ** limitations under the License.
 */
 
-#include "guest/hals/ril/vsoc_ril.h"
+#include "guest/hals/ril/cuttlefish_ril.h"
 
 #include <cutils/properties.h>
 #include <string.h>
@@ -32,7 +32,7 @@
 #include "common/vsoc/lib/ril_region_view.h"
 #include "guest/libs/platform_support/api_level_fixes.h"
 
-#define VSOC_RIL_VERSION_STRING "Android VSoC RIL 1.0"
+#define CUTTLEFISH_RIL_VERSION_STRING "Android Cuttlefish RIL 1.0"
 
 /* Modem Technology bits */
 #define MDM_GSM 0x01
@@ -302,7 +302,7 @@
   }
 
   if (call.connection_type_ != DataCall::kConnTypeIPv4) {
-    ALOGE("Non-IPv4 connections are not supported by VSOC RIL.");
+    ALOGE("Non-IPv4 connections are not supported by Cuttlefish RIL.");
     gce_ril_env->OnRequestComplete(t, RIL_E_GENERIC_FAILURE, NULL, 0);
     return;
   }
@@ -1391,8 +1391,8 @@
 }
 
 static const char* gce_ril_get_version(void) {
-  ALOGV("Reporting VSOC version " VSOC_RIL_VERSION_STRING);
-  return VSOC_RIL_VERSION_STRING;
+  ALOGV("Reporting Cuttlefish version " CUTTLEFISH_RIL_VERSION_STRING);
+  return CUTTLEFISH_RIL_VERSION_STRING;
 }
 
 static int s_cell_info_rate_ms = INT_MAX;
@@ -2459,10 +2459,10 @@
   }
 }
 
-#define VSOC_RIL_VERSION 6
+#define CUTTLEFISH_RIL_VERSION 6
 
 static const RIL_RadioFunctions ril_callbacks = {
-    VSOC_RIL_VERSION,     gce_ril_on_request, gce_ril_current_state,
+    CUTTLEFISH_RIL_VERSION,     gce_ril_on_request, gce_ril_current_state,
     gce_ril_on_supports, gce_ril_on_cancel,  gce_ril_get_version};
 
 extern "C" {

guest/hals/ril/cuttlefish_ril.h

diff --git a/guest/hals/ril/vsoc_ril.h b/guest/hals/ril/cuttlefish_ril.h
similarity index 95%
rename from guest/hals/ril/vsoc_ril.h
rename to guest/hals/ril/cuttlefish_ril.h
index 982ff56..442c377 100644
--- a/guest/hals/ril/vsoc_ril.h
+++ b/guest/hals/ril/cuttlefish_ril.h
@@ -18,7 +18,7 @@
 
 #define RIL_SHLIB
 
-#define LOG_TAG "VSoCRil"
+#define LOG_TAG "CuttlefishRil"
 
 #include <log/log.h>
 #include <stdint.h>