diff options
| author | Josh Gao <jmgao@google.com> | 2017-06-20 04:30:07 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-06-20 04:30:07 +0000 |
| commit | 17d3fc2e6847a31116d4db9d13893e6c5a760221 (patch) | |
| tree | 392967646058de8eb9c24d5c80c02b71ab9512d1 /cmds/screencap | |
| parent | 50bad313e4bf310568f70195c3a751d79bddc16c (diff) | |
| parent | e139434e3ab235fde6a5d17b9128e5665db32115 (diff) | |
Merge "Hack around b/36066697." into oc-dev
am: e139434e3a
Change-Id: I422d2b73fc854047d1293919c25f0656df0842c9
Diffstat (limited to 'cmds/screencap')
| -rw-r--r-- | cmds/screencap/screencap.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/cmds/screencap/screencap.cpp b/cmds/screencap/screencap.cpp index 607e6e0186e7..71be63237739 100644 --- 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); } |