commit e4c52f608e0092f4929cd7df764bbe665e408064
author Tomasz Wiszkowski <ender@google.com> Mon Oct 02 14:06:21 2017 -0700
committer Greg Hartman <ghartman@google.com> Mon Oct 09 17:29:29 2017 -0700
tree ce0e46f107e327f16d0fbaa3c1ce08f466392cc8
parent 8428e4b309ffbd41e341ed9cad2188e458984602

Use ANDROID_BUILD_OUT for image source, if available

Also: drop auto-generated debhelper files. These files should not have
been added.

Change-Id: I09198207ad9d516862df3892e2468dcdf36112f3
(cherry picked from commit 1044e82479d83748b4253324acff6f48ecaa4ad3)

launcher/main.cc

diff --git a/launcher/main.cc b/launcher/main.cc
index d46810f..11bbaac 100644
--- a/launcher/main.cc
+++ b/launcher/main.cc
@@ -19,7 +19,7 @@
 #include "host/vadb/virtual_adb_server.h"
 
 namespace {
-std::string StringFromEnv(const char *varname, std::string defval) {
+std::string StringFromEnv(const char* varname, std::string defval) {
   const char* const valstr = getenv(varname);
   if (!valstr) {
     return defval;
@@ -40,7 +40,8 @@
 DEFINE_string(qemusocket, "/tmp/ivshmem_socket_qemu", "QEmu socket path");
 DEFINE_string(clientsocket, "/tmp/ivshmem_socket_client", "Client socket path");
 
-DEFINE_string(system_image_dir, StringFromEnv("HOME", "."),
+DEFINE_string(system_image_dir,
+              StringFromEnv("ANDROID_PRODUCT_OUT", StringFromEnv("HOME", ".")),
               "Location of the system partition images.");
 DEFINE_string(kernel, "", "Location of cuttlefish kernel file.");
 DEFINE_string(kernel_command_line, "",
@@ -184,12 +185,12 @@
   // exist or could not be created.
   auto system_partition = config::FilePartition::ReuseExistingFile(
       FLAGS_system_image_dir + "/system.img");
-  auto data_partition = config::FilePartition::ReuseExistingFile(
-      FLAGS_data_image);
-  auto cache_partition =  config::FilePartition::ReuseExistingFile(
-      FLAGS_cache_image);
-  auto vendor_partition =  config::FilePartition::ReuseExistingFile(
-      FLAGS_vendor_image);
+  auto data_partition =
+      config::FilePartition::ReuseExistingFile(FLAGS_data_image);
+  auto cache_partition =
+      config::FilePartition::ReuseExistingFile(FLAGS_cache_image);
+  auto vendor_partition =
+      config::FilePartition::ReuseExistingFile(FLAGS_vendor_image);
 
   std::ifstream t(FLAGS_kernel_command_line);
   if (!t) {
@@ -204,7 +205,7 @@
   cmdline.reserve(commandline_size);
   t.seekg(0, std::ios::beg);
   cmdline.assign((std::istreambuf_iterator<char>(t)),
-             std::istreambuf_iterator<char>());
+                 std::istreambuf_iterator<char>());
   t.close();
 
   unsigned long libvirt_version;