commit b61f2ea1e23bd2249c2c58366d65570113d6c08d
author Jorge E. Moreira <jemoreira@google.com> Wed Jun 27 10:33:24 2018 -0700
committer Greg Hartman <ghartman@google.com> Mon Jul 23 16:45:30 2018 -0700
tree 7968a595c684b8c7e9cfd9b9dd6c5509477cbabd
parent 8751ab253338bcc26fdf9cc0214e3c9155e8dc71

Renames 'runfiles' directory to 'cuttlefish_runtime'

Bug: 110478603
Test: run locally and on gce
Change-Id: Ie86ac21367c9e0cb902aedbbb1707ba83a5817bf
Merged-In: Ie86ac21367c9e0cb902aedbbb1707ba83a5817bf
(cherry picked from commit 285b48b12e5aaf3188b5526e21de1fe35ae4153f)

host/libs/config/cuttlefish_config.cpp

diff --git a/host/libs/config/cuttlefish_config.cpp b/host/libs/config/cuttlefish_config.cpp
index a2a3e0b..2ef2058 100644
--- a/host/libs/config/cuttlefish_config.cpp
+++ b/host/libs/config/cuttlefish_config.cpp
@@ -451,7 +451,7 @@
 std::string GetDefaultPerInstanceDir() {
   std::ostringstream stream;
   if (HostSupportsQemuCli()) {
-    stream << std::getenv("HOME") << "/runfiles";
+    stream << std::getenv("HOME") << "/cuttlefish_runtime";
   } else {
     stream << "/var/run/libvirt-" << kDefaultUuidPrefix << std::setfill('0')
            << std::setw(2) << GetInstance();

host/libs/vm_manager/cf_qemu.sh

diff --git a/host/libs/vm_manager/cf_qemu.sh b/host/libs/vm_manager/cf_qemu.sh
index 513f51c..fa4c872 100644
--- a/host/libs/vm_manager/cf_qemu.sh
+++ b/host/libs/vm_manager/cf_qemu.sh
@@ -26,7 +26,7 @@
 CUTTLEFISH_INSTANCE="${CUTTLEFISH_INSTANCE:-$(default_instance_number)}"
 default_instance_name="cvd-${CUTTLEFISH_INSTANCE}"
 default_uuid="699acfc4-c8c4-11e7-882b-5065f31dc1${CUTTLEFISH_INSTANCE}"
-default_dir="${HOME}/runfiles"
+default_dir="${HOME}/cuttlefish_runtime"
 default_mobile_tap_name="cvd-mtap-${CUTTLEFISH_INSTANCE}"
 default_wifi_tap_name="cvd-wtap-${CUTTLEFISH_INSTANCE}"