Merge "Hack around b/36066697." into oc-dev

am: e139434e3a Change-Id: I422d2b73fc854047d1293919c25f0656df0842c9
2017-06-20 04:30:07 +00:00
parent 50bad313e4 e139434e3a
commit 17d3fc2e68
1 changed files with 3 additions and 1 deletions
--- a/cmds/screencap/screencap.cpp
+++ b/cmds/screencap/screencap.cpp
@@ -251,5 +251,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);
 }