summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Josh Gao <jmgao@google.com> 2017-06-20 04:31:40 +0000
committer android-build-merger <android-build-merger@google.com> 2017-06-20 04:31:40 +0000
commit8effb089ede2e59a01baa70cf1e29654c4abf2dd (patch)
tree4266708cf91a0a729104f493a1d076f82e10bf91
parent4d813757c73347e2804c898cbd28fe3a3e4d65ae (diff)
parente139434e3ab235fde6a5d17b9128e5665db32115 (diff)
Merge "Hack around b/36066697." into oc-dev
am: e139434e3a Change-Id: I97427d86074cea38ca6aa59264e98a5d81645830
-rw-r--r--cmds/screencap/screencap.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/cmds/screencap/screencap.cpp b/cmds/screencap/screencap.cpp
index 5fedc9e74087..c4f17fa23819 100644
--- a/cmds/screencap/screencap.cpp
+++ b/cmds/screencap/screencap.cpp
@@ -214,5 +214,7 @@ int main(int argc, char** argv)
if (mapbase != MAP_FAILED) {
munmap((void *)mapbase, mapsize);
}
- return 0;
+
+ // b/36066697: Avoid running static destructors.
+ _exit(1);
}