Commit 21267465 authored by Yusuke Sato's avatar Yusuke Sato Committed by Commit Bot

arc: Remove LOG(ERROR)s in linux-chromeos output

BUG=chromium:1085456
TEST=./testing/xvfb.py ./out/Release/chrome

Change-Id: Ibdfb20f03846266033e55956d10a2552f5529640
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2398892Reviewed-by: default avatarLong Cheng <lgcheng@google.com>
Auto-Submit: Yusuke Sato <yusukes@chromium.org>
Commit-Queue: Yusuke Sato <yusukes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#805075}
parent 54eb199c
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "base/strings/string_split.h" #include "base/strings/string_split.h"
#include "base/strings/string_util.h" #include "base/strings/string_util.h"
#include "base/strings/stringprintf.h" #include "base/strings/stringprintf.h"
#include "base/system/sys_info.h"
#include "chromeos/constants/chromeos_switches.h" #include "chromeos/constants/chromeos_switches.h"
namespace brillo { namespace brillo {
...@@ -295,7 +296,8 @@ bool ExpandPropertyFile(const base::FilePath& input, ...@@ -295,7 +296,8 @@ bool ExpandPropertyFile(const base::FilePath& input,
std::string content; std::string content;
std::string expanded; std::string expanded;
if (!base::ReadFileToString(input, &content)) { if (!base::ReadFileToString(input, &content)) {
PLOG(ERROR) << "Failed to read " << input; if (base::SysInfo::IsRunningOnChromeOS())
PLOG(ERROR) << "Failed to read " << input;
return false; return false;
} }
if (!ExpandPropertyContents(content, config, &expanded, if (!ExpandPropertyContents(content, config, &expanded,
...@@ -323,7 +325,8 @@ bool ExpandPropertyFile(const base::FilePath& input, ...@@ -323,7 +325,8 @@ bool ExpandPropertyFile(const base::FilePath& input,
CrosConfig::CrosConfig() { CrosConfig::CrosConfig() {
const base::CommandLine* cl = base::CommandLine::ForCurrentProcess(); const base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
if (!cl->HasSwitch(chromeos::switches::kArcBuildProperties)) { if (!cl->HasSwitch(chromeos::switches::kArcBuildProperties)) {
LOG(ERROR) << chromeos::switches::kArcBuildProperties << " is not found"; if (base::SysInfo::IsRunningOnChromeOS())
LOG(ERROR) << chromeos::switches::kArcBuildProperties << " is not found";
return; return;
} }
std::string command_line_value = std::string command_line_value =
...@@ -417,7 +420,8 @@ bool ExpandPropertyFiles(const base::FilePath& source_path, ...@@ -417,7 +420,8 @@ bool ExpandPropertyFiles(const base::FilePath& source_path,
single_file ? dest_path : dest_path.Append(file), &config, single_file ? dest_path : dest_path.Append(file), &config,
/*append=*/single_file, add_native_bridge_64bit_support, /*append=*/single_file, add_native_bridge_64bit_support,
append_dalvik_isa, partition_name)) { append_dalvik_isa, partition_name)) {
LOG(ERROR) << "Failed to expand " << source_path.Append(file); if (base::SysInfo::IsRunningOnChromeOS())
LOG(ERROR) << "Failed to expand " << source_path.Append(file);
return false; return false;
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment