summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Todd Kennedy <toddke@google.com> 2018-11-13 17:01:32 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2018-11-13 17:01:32 +0000
commitd65a1323c087ca2e34b43c04ff7de8154e76403f (patch)
treeb47cce9669c647ee5175063789375457b951a662
parent321d0727c4a55a6687a62d10062f85e89cfa2acf (diff)
parente63a4a28ab193ed007ecbc0a023974ae8f8aca50 (diff)
Merge "idmap2: silence irrelevant warning during 'idmap2 scan'"
-rw-r--r--cmds/idmap2/idmap2/Scan.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/cmds/idmap2/idmap2/Scan.cpp b/cmds/idmap2/idmap2/Scan.cpp
index 33c274e7fd35..00c49e38e8b2 100644
--- a/cmds/idmap2/idmap2/Scan.cpp
+++ b/cmds/idmap2/idmap2/Scan.cpp
@@ -138,7 +138,8 @@ bool Scan(const std::vector<std::string>& args, std::ostream& out_error) {
std::stringstream stream;
for (auto iter = interesting_apks.cbegin(); iter != interesting_apks.cend(); ++iter) {
const std::string idmap_path = Idmap::CanonicalIdmapPathFor(output_directory, *iter);
- if (!Verify(std::vector<std::string>({"--idmap-path", idmap_path}), out_error) &&
+ std::stringstream dev_null;
+ if (!Verify(std::vector<std::string>({"--idmap-path", idmap_path}), dev_null) &&
!Create(std::vector<std::string>({
"--target-apk-path",
target_apk_path,