Don't use virtio as hardware name
Use cutf_{ivsh,cvm} instead
Bug: 125516243
Test: run locally
Change-Id: I42f434e21bbdf054c44b2501066b021edf3ba64a
diff --git a/guest/hals/audio/Android.mk b/guest/hals/audio/Android.mk
index dab1bcd..8d4ef0a 100644
--- a/guest/hals/audio/Android.mk
+++ b/guest/hals/audio/Android.mk
@@ -59,7 +59,7 @@
$(VSOC_VERSION_CFLAGS)
-LOCAL_MODULE := audio.primary.vsoc
+LOCAL_MODULE := audio.primary.cutf_ivsh
LOCAL_VENDOR_MODULE := true
include $(BUILD_SHARED_LIBRARY)
diff --git a/guest/hals/camera/Android.mk b/guest/hals/camera/Android.mk
index ceaded9..0b2a87f 100644
--- a/guest/hals/camera/Android.mk
+++ b/guest/hals/camera/Android.mk
@@ -124,7 +124,7 @@
$(if $(enable_emulated_camera2),$(emulated_camera2_src),) \
$(if $(enable_emulated_camera3),$(emulated_camera3_src),)
-LOCAL_MODULE := camera.vsoc
+LOCAL_MODULE := camera.cutf
LOCAL_MODULE_TAGS := optional
LOCAL_VENDOR_MODULE := true
@@ -175,7 +175,7 @@
LOCAL_C_INCLUDES += ${jpeg_c_includes}
LOCAL_SRC_FILES := ${jpeg_src}
-LOCAL_MODULE := camera.vsoc.jpeg
+LOCAL_MODULE := camera.cutf.jpeg
LOCAL_MODULE_TAGS := optional
LOCAL_VENDOR_MODULE := true
diff --git a/guest/hals/camera/JpegCompressor.cpp b/guest/hals/camera/JpegCompressor.cpp
index 2dae838..99164c9 100644
--- a/guest/hals/camera/JpegCompressor.cpp
+++ b/guest/hals/camera/JpegCompressor.cpp
@@ -46,10 +46,10 @@
NV21JpegCompressor::NV21JpegCompressor() {
if (mDl == NULL) {
- mDl = dlopen("/vendor/lib/hw/camera.vsoc.jpeg.so", RTLD_NOW);
+ mDl = dlopen("/vendor/lib/hw/camera.cutf.jpeg.so", RTLD_NOW);
}
if (mDl == NULL) {
- mDl = dlopen("/system/lib/hw/camera.vsoc.jpeg.so", RTLD_NOW);
+ mDl = dlopen("/system/lib/hw/camera.cutf.jpeg.so", RTLD_NOW);
}
assert(mDl != NULL);
diff --git a/guest/hals/gatekeeper/Android.mk b/guest/hals/gatekeeper/Android.mk
index 03f684a..85d7346 100644
--- a/guest/hals/gatekeeper/Android.mk
+++ b/guest/hals/gatekeeper/Android.mk
@@ -24,7 +24,7 @@
endif
LOCAL_VENDOR_MODULE := true
-LOCAL_MODULE := gatekeeper.vsoc
+LOCAL_MODULE := gatekeeper.cutf
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_CFLAGS := -Wall -Wextra -Werror -Wunused
diff --git a/guest/hals/gps/Android.mk b/guest/hals/gps/Android.mk
index 1829c2f..9443980 100644
--- a/guest/hals/gps/Android.mk
+++ b/guest/hals/gps/Android.mk
@@ -28,7 +28,7 @@
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_SRC_FILES := gps_vsoc.cpp gps_thread.cpp
-LOCAL_MODULE := gps.vsoc
+LOCAL_MODULE := gps.cutf
LOCAL_C_INCLUDES := device/google/cuttlefish_common
LOCAL_HEADER_LIBRARIES := \
diff --git a/guest/hals/gralloc/Android.mk b/guest/hals/gralloc/Android.mk
index 5fe2d54..68ffffa 100644
--- a/guest/hals/gralloc/Android.mk
+++ b/guest/hals/gralloc/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := gralloc.vsoc-future
+LOCAL_MODULE := gralloc.cutf_ivsh-future
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := \
diff --git a/guest/hals/gralloc/legacy/Android.mk b/guest/hals/gralloc/legacy/Android.mk
index fe01635..57dae50 100644
--- a/guest/hals/gralloc/legacy/Android.mk
+++ b/guest/hals/gralloc/legacy/Android.mk
@@ -29,7 +29,7 @@
$(VSOC_VERSION_CFLAGS)
include $(CLEAR_VARS)
-LOCAL_MODULE := gralloc.vsoc
+LOCAL_MODULE := gralloc.cutf
LOCAL_MODULE_RELATIVE_PATH := hw
LOCAL_MODULE_TAGS := optional
diff --git a/guest/hals/hwcomposer/vsoc-future/Android.mk b/guest/hals/hwcomposer/vsoc-future/Android.mk
index 1a8c44f..bcc104e 100644
--- a/guest/hals/hwcomposer/vsoc-future/Android.mk
+++ b/guest/hals/hwcomposer/vsoc-future/Android.mk
@@ -16,7 +16,7 @@
include $(CLEAR_VARS)
-LOCAL_MODULE := hwcomposer.vsoc-future
+LOCAL_MODULE := hwcomposer.cutf_ivsh-future
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := \
diff --git a/guest/hals/hwcomposer/vsoc/Android.mk b/guest/hals/hwcomposer/vsoc/Android.mk
index f2fe5c3..2d22f2d 100644
--- a/guest/hals/hwcomposer/vsoc/Android.mk
+++ b/guest/hals/hwcomposer/vsoc/Android.mk
@@ -21,7 +21,7 @@
include $(CLEAR_VARS)
include $(LOCAL_PATH)/hwcomposer.mk
LOCAL_CFLAGS += -DUSE_OLD_HWCOMPOSER -Wall -Werror
-LOCAL_MODULE := hwcomposer.vsoc-deprecated
+LOCAL_MODULE := hwcomposer.cutf_ivsh-deprecated
# See b/67109557
ifeq (true, $(TARGET_TRANSLATE_2ND_ARCH))
@@ -33,7 +33,7 @@
# New hwcomposer, performs software composition
include $(CLEAR_VARS)
include $(LOCAL_PATH)/hwcomposer.mk
-LOCAL_MODULE := hwcomposer.vsoc
+LOCAL_MODULE := hwcomposer.cutf_ivsh
LOCAL_VENDOR_MODULE := true
# See b/67109557
diff --git a/guest/hals/lights/Android.mk b/guest/hals/lights/Android.mk
index 6add0f2..8c292dc 100644
--- a/guest/hals/lights/Android.mk
+++ b/guest/hals/lights/Android.mk
@@ -29,7 +29,7 @@
LOCAL_HEADER_LIBRARIES := libhardware_headers
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_SRC_FILES := lights_vsoc.c
-LOCAL_MODULE := lights.vsoc
+LOCAL_MODULE := lights.cutf
LOCAL_CFLAGS += -DLIGHT_BACKLIGHT -DLOG_TAG=\"VSoC-lights\" $(VSOC_VERSION_CFLAGS)
LOCAL_VENDOR_MODULE := true
include $(BUILD_SHARED_LIBRARY)
diff --git a/guest/hals/power/Android.mk b/guest/hals/power/Android.mk
index d5ead05..d73bc0f 100644
--- a/guest/hals/power/Android.mk
+++ b/guest/hals/power/Android.mk
@@ -32,7 +32,7 @@
LOCAL_HEADER_LIBRARIES := libhardware_headers libutils_headers
LOCAL_SHARED_LIBRARIES := liblog libcutils
LOCAL_SRC_FILES := power.c
-LOCAL_MODULE := power.vsoc
+LOCAL_MODULE := power.cutf
LOCAL_MODULE_TAGS := optional
LOCAL_VENDOR_MODULE := true
include $(BUILD_SHARED_LIBRARY)
diff --git a/guest/hals/ril/Android.mk b/guest/hals/ril/Android.mk
index 08e3637..85503b0 100644
--- a/guest/hals/ril/Android.mk
+++ b/guest/hals/ril/Android.mk
@@ -28,7 +28,6 @@
cuttlefish_net \
cuttlefish_auto_resources \
libbase \
- vsoc_lib
LOCAL_C_INCLUDES := \
device/google/cuttlefish_common \
diff --git a/guest/hals/sensors/Android.mk b/guest/hals/sensors/Android.mk
index cdef117..e9a1a1a 100644
--- a/guest/hals/sensors/Android.mk
+++ b/guest/hals/sensors/Android.mk
@@ -57,7 +57,7 @@
libcuttlefish_remoter_framework \
$(VSOC_STLPORT_STATIC_LIBS)
-LOCAL_MODULE := sensors.vsoc
+LOCAL_MODULE := sensors.cutf
LOCAL_VENDOR_MODULE := true
include $(BUILD_SHARED_LIBRARY)
diff --git a/host/commands/launch/flags.cc b/host/commands/launch/flags.cc
index ae5d0e6..9e1427a 100644
--- a/host/commands/launch/flags.cc
+++ b/host/commands/launch/flags.cc
@@ -57,7 +57,7 @@
"Console device for the Android framework");
DEFINE_string(
hardware_name, "",
- "The codename of the device's hardware, one of {vsoc, virtio}");
+ "The codename of the device's hardware, one of {cutf_ivsh, cutf_cvm}");
DEFINE_string(guest_security, "selinux",
"The security module to use in the guest");
DEFINE_bool(guest_enforce_security, false,
@@ -455,8 +455,7 @@
SetCommandLineOptionWithMode("instance_dir",
default_instance_dir.c_str(),
google::FlagSettingMode::SET_FLAGS_DEFAULT);
- SetCommandLineOptionWithMode("hardware_name",
- "vsoc",
+ SetCommandLineOptionWithMode("hardware_name", "cutf_ivsh",
google::FlagSettingMode::SET_FLAGS_DEFAULT);
SetCommandLineOptionWithMode("adb_mode", "tunnel",
google::FlagSettingMode::SET_FLAGS_DEFAULT);
@@ -488,8 +487,7 @@
SetCommandLineOptionWithMode("instance_dir",
default_instance_dir.c_str(),
google::FlagSettingMode::SET_FLAGS_DEFAULT);
- SetCommandLineOptionWithMode("hardware_name",
- "virtio",
+ SetCommandLineOptionWithMode("hardware_name", "cutf_cvm",
google::FlagSettingMode::SET_FLAGS_DEFAULT);
SetCommandLineOptionWithMode("adb_mode", "vsock_tunnel",
google::FlagSettingMode::SET_FLAGS_DEFAULT);
diff --git a/host/libs/config/cuttlefish_config.cpp b/host/libs/config/cuttlefish_config.cpp
index 3940739..ada6dc6 100644
--- a/host/libs/config/cuttlefish_config.cpp
+++ b/host/libs/config/cuttlefish_config.cpp
@@ -790,7 +790,7 @@
bool CuttlefishConfig::enable_ivserver() const {
- return hardware_name() == "vsoc";
+ return hardware_name() == "cutf_ivsh";
}
// Creates the (initially empty) config object and populates it with values from
