Commit Graph

18674 Commits

Author SHA1 Message Date
Evgenii Stepanov f09111a9dd am fbaaddc5: am 19584247: am ee08fb53: Merge "asan: update condition to work with multiple SANITIZE_TARGET values."
* commit 'fbaaddc588f9d716cff71225a5c510f3b33b90cf':
  asan: update condition to work with multiple SANITIZE_TARGET values.
2015-09-20 01:25:13 +00:00
Evgenii Stepanov fbaaddc588 am 19584247: am ee08fb53: Merge "asan: update condition to work with multiple SANITIZE_TARGET values."
* commit '195842474a6722fdf2d967446b81d8accbd4648c':
  asan: update condition to work with multiple SANITIZE_TARGET values.
2015-09-18 20:41:46 +00:00
Evgenii Stepanov 195842474a am ee08fb53: Merge "asan: update condition to work with multiple SANITIZE_TARGET values."
* commit 'ee08fb53bb59cb5037755d68de09e6e5bc3f8bc6':
  asan: update condition to work with multiple SANITIZE_TARGET values.
2015-09-18 20:31:52 +00:00
Evgenii Stepanov ee08fb53bb Merge "asan: update condition to work with multiple SANITIZE_TARGET values." 2015-09-18 20:23:52 +00:00
Ivan Krasin 5039d8cd21 asan: update condition to work with multiple SANITIZE_TARGET values.
The goal is to enable SANITIZE_TARGET='address coverage', which
will be used by LLVMFuzzer.

Bug: 22850550
Change-Id: Iea756eaaedaa56aee4daf714510269efe3aaa553
2015-09-18 11:59:46 -07:00
Yabin Cui 678a56031b am 963a3e15: am 84c5dd0f: am 94c617cc: Merge "Revert "Add BacktraceOffline for offline backtracing.""
* commit '963a3e15f6ccea91a5ebffd0babe1a10b8cd65c1':
  Revert "Add BacktraceOffline for offline backtracing."
2015-09-17 23:19:09 +00:00
Yabin Cui 963a3e15f6 am 84c5dd0f: am 94c617cc: Merge "Revert "Add BacktraceOffline for offline backtracing.""
* commit '84c5dd0f17872ceb052af00a8742a35590468da4':
  Revert "Add BacktraceOffline for offline backtracing."
2015-09-17 23:12:38 +00:00
Yabin Cui 84c5dd0f17 am 94c617cc: Merge "Revert "Add BacktraceOffline for offline backtracing.""
* commit '94c617ccbba4db673a6c4cc682927e630a8feaf0':
  Revert "Add BacktraceOffline for offline backtracing."
2015-09-17 23:06:42 +00:00
Yabin Cui 94c617ccbb Merge "Revert "Add BacktraceOffline for offline backtracing."" 2015-09-17 22:58:36 +00:00
Yabin Cui ab5e583327 Revert "Add BacktraceOffline for offline backtracing."
Using llvm makes libbacktrace stops building for 32 bit on linux host x86_64.

This reverts commit c9c6b6ee77.

Change-Id: Ieb807db881d7bb3132cd09e25fd08c28766ca0a8
2015-09-17 22:54:22 +00:00
Yabin Cui 77a07703f4 am d1c3e69a: am fe965294: am ee645af4: Merge "Add BacktraceOffline for offline backtracing."
* commit 'd1c3e69a4838be82d02580d51be4781c849981bf':
  Add BacktraceOffline for offline backtracing.
2015-09-17 22:38:46 +00:00
Yabin Cui d1c3e69a48 am fe965294: am ee645af4: Merge "Add BacktraceOffline for offline backtracing."
* commit 'fe9652946e6635111a924986b7b23467ddc5b71e':
  Add BacktraceOffline for offline backtracing.
2015-09-17 22:31:43 +00:00
Elliott Hughes 354bc5030b am 15b9dbad: am 8fd98104: am a951a82d: Merge "adb unittest for win32 handle inheritance"
* commit '15b9dbad7f4da6d0d09814e7b81d1b58178333ac':
  adb unittest for win32 handle inheritance
2015-09-17 22:29:32 +00:00
Yabin Cui fe9652946e am ee645af4: Merge "Add BacktraceOffline for offline backtracing."
* commit 'ee645af487e8611bcc80a4fad841bdd05e36e9f3':
  Add BacktraceOffline for offline backtracing.
2015-09-17 22:22:31 +00:00
Elliott Hughes 15b9dbad7f am 8fd98104: am a951a82d: Merge "adb unittest for win32 handle inheritance"
* commit '8fd981040d6396d74ccbaafbb28688aedc34e6bb':
  adb unittest for win32 handle inheritance
2015-09-17 22:20:23 +00:00
Elliott Hughes 8fd981040d am a951a82d: Merge "adb unittest for win32 handle inheritance"
* commit 'a951a82dcc9cbefb4162a048d5d668dcb855cbf5':
  adb unittest for win32 handle inheritance
2015-09-17 22:08:42 +00:00
Yabin Cui ee645af487 Merge "Add BacktraceOffline for offline backtracing." 2015-09-17 22:07:04 +00:00
Elliott Hughes a951a82dcc Merge "adb unittest for win32 handle inheritance" 2015-09-17 22:04:17 +00:00
Steve Fung 2eddc40f91 am ba2c73c1: am 331cc9a8: am 557aa2e9: Merge "crash_reporter: Generate and use own guid"
* commit 'ba2c73c18c61c101f91ebea404b0f4e0297f2138':
  crash_reporter: Generate and use own guid
2015-09-17 21:02:30 +00:00
Dan Willemsen de26a3b038 am 17a36695: am e0506e0d: am 9721bb4c: Merge "Add Android.bp for liblog"
* commit '17a366956b8f11c335305c80f5afaf6f4746a796':
  Add Android.bp for liblog
2015-09-17 21:02:22 +00:00
Steve Fung ba2c73c18c am 331cc9a8: am 557aa2e9: Merge "crash_reporter: Generate and use own guid"
* commit '331cc9a828293bfff8b5083c9e59a6f478d66df1':
  crash_reporter: Generate and use own guid
2015-09-17 20:10:28 +00:00
Bertrand Simonnet 1580d1c7ea am d9f7a1c2: am 473604c1: am ccdd012f: Merge "metricsd: Fix CumulativeUseTime metrics."
* commit 'd9f7a1c298c8b22818326206da535e1ea26664e5':
  metricsd: Fix CumulativeUseTime metrics.
2015-09-17 20:00:41 +00:00
Elliott Hughes 89faaada0d am 8057b81e: am 09a0d98b: am 1d758c90: Merge "adb unittest: make test_sync properly cleanup after itself"
* commit '8057b81e22a1d0bfedaaa4687e06148b683b2ba2':
  adb unittest: make test_sync properly cleanup after itself
2015-09-17 19:59:32 +00:00
Steve Fung 331cc9a828 am 557aa2e9: Merge "crash_reporter: Generate and use own guid"
* commit '557aa2e9987fd832e4ce14b9e1421851f25ca60f':
  crash_reporter: Generate and use own guid
2015-09-17 19:59:09 +00:00
Dan Willemsen 17a366956b am e0506e0d: am 9721bb4c: Merge "Add Android.bp for liblog"
* commit 'e0506e0ddc9ee080c813f3449601f99b2d7ce586':
  Add Android.bp for liblog
2015-09-17 19:52:49 +00:00
Steve Fung 557aa2e998 Merge "crash_reporter: Generate and use own guid" 2015-09-17 19:51:51 +00:00
Dan Willemsen e0506e0ddc am 9721bb4c: Merge "Add Android.bp for liblog"
* commit '9721bb4c9b0ea6fb260f3d9015b408b8b42fa634':
  Add Android.bp for liblog
2015-09-17 19:40:40 +00:00
Dan Willemsen 9721bb4c9b Merge "Add Android.bp for liblog" 2015-09-17 19:30:50 +00:00
Bertrand Simonnet d9f7a1c298 am 473604c1: am ccdd012f: Merge "metricsd: Fix CumulativeUseTime metrics."
* commit '473604c1c2b4e08f2fd904dea08f40c26d6f8604':
  metricsd: Fix CumulativeUseTime metrics.
2015-09-17 18:31:48 +00:00
Bertrand Simonnet 473604c1c2 am ccdd012f: Merge "metricsd: Fix CumulativeUseTime metrics."
* commit 'ccdd012ff360e8a04055cdb9dbead282cca839d3':
  metricsd: Fix CumulativeUseTime metrics.
2015-09-17 18:23:44 +00:00
Bertrand Simonnet ccdd012ff3 Merge "metricsd: Fix CumulativeUseTime metrics." 2015-09-17 18:13:13 +00:00
Bertrand SIMONNET 2d03783ccc metricsd: Fix CumulativeUseTime metrics.
This fixes three things:
* name of the metrics: the metrics does not represent the daily use.
* arithmetic error: we collect the use time in seconds so no need to
  divide by 1000 to get seconds.
* the metrics should not be reset daily.

This CL also renames the Send* helper methods to be more explicit about
resetting the counters.

This was also committed in Chrome OS at:
https://chromium-review.googlesource.com/#/c/300059/.

BUG:24131693
TEST: unit tests.

Change-Id: I712baa1fd639b9b0df60906d94a0904d8c6760aa
2015-09-17 09:39:34 -07:00
Spencer Low 1ce06087db adb unittest for win32 handle inheritance
adb.cpp: launch_server() has a long comment about how
stdin/stdout/stderr handles have to be made non-inheritable to prevent
hangs in callers to adb.exe.

It would be disastrous to do this wrong, and I've modified this code, so
here's a unittest to verify that I'm doing it right.

The test also runs fine on unix.

Change-Id: I3672c3066bc7498635c19212f9e5c50757942439
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-09-16 20:50:53 -07:00
Elliott Hughes 8057b81e22 am 09a0d98b: am 1d758c90: Merge "adb unittest: make test_sync properly cleanup after itself"
* commit '09a0d98bebce23f014ea11af002c1fafaf6b8065':
  adb unittest: make test_sync properly cleanup after itself
2015-09-17 03:17:27 +00:00
Elliott Hughes 09a0d98beb am 1d758c90: Merge "adb unittest: make test_sync properly cleanup after itself"
* commit '1d758c90959225c76ed4d318290ad1bf11532409':
  adb unittest: make test_sync properly cleanup after itself
2015-09-17 03:10:54 +00:00
Elliott Hughes 1d758c9095 Merge "adb unittest: make test_sync properly cleanup after itself" 2015-09-17 03:03:31 +00:00
Yabin Cui 8198893560 am c3755684: am eee68196: am 0b743df4: Merge "Add unit tests for local socket."
* commit 'c37556840191d38ddb718960b7549cafd1c54223':
  Add unit tests for local socket.
2015-09-17 02:54:34 +00:00
Yabin Cui c375568401 am eee68196: am 0b743df4: Merge "Add unit tests for local socket."
* commit 'eee68196e9198b781e23fa01d3f82bd60d515cca':
  Add unit tests for local socket.
2015-09-17 02:45:48 +00:00
Yabin Cui eee68196e9 am 0b743df4: Merge "Add unit tests for local socket."
* commit '0b743df4c4813d59c0405fbb32d59441399d8478':
  Add unit tests for local socket.
2015-09-17 02:38:45 +00:00
Yabin Cui 0b743df4c4 Merge "Add unit tests for local socket." 2015-09-17 02:32:12 +00:00
Yabin Cui c9c6b6ee77 Add BacktraceOffline for offline backtracing.
It is used by simpeleprf for stack unwinding.

Bug: 22229391
Change-Id: I26d698610ccdc9545da837bc5a8a9ec787f27a6b
2015-09-16 17:38:23 -07:00
Elliott Hughes 5b867e50d7 am 853e6b79: am b9b05199: am d17cf08e: Merge "adb: win32: fix regression on older versions of Windows"
* commit '853e6b79c2d386263b7b588805c1a3fdb967ed90':
  adb: win32: fix regression on older versions of Windows
2015-09-17 00:25:25 +00:00
Elliott Hughes 853e6b79c2 am b9b05199: am d17cf08e: Merge "adb: win32: fix regression on older versions of Windows"
* commit 'b9b0519995d4beeee9c443f046315b18305d369f':
  adb: win32: fix regression on older versions of Windows
2015-09-17 00:16:23 +00:00
Elliott Hughes b9b0519995 am d17cf08e: Merge "adb: win32: fix regression on older versions of Windows"
* commit 'd17cf08eca500a96f4808744b8a0a34664291de8':
  adb: win32: fix regression on older versions of Windows
2015-09-17 00:08:43 +00:00
Elliott Hughes d17cf08eca Merge "adb: win32: fix regression on older versions of Windows" 2015-09-17 00:03:22 +00:00
Spencer Low bc36bdbdc8 adb: win32: fix regression on older versions of Windows
On Windows 7, GetStdHandle() may return console pseudo-handles. If you
call SetHandleInformation(h, HANDLE_FLAG_INHERIT, 0) on such a handle,
it will fail. These failures should be ignored like the old code.

Newer versions of Windows return real handles that don't have this
issue. Console pseudo-handles can apparently be identified by the values
3, 7, 11.

This is a regression from 2122c7a148.

https://code.google.com/p/android/issues/detail?id=186599

Change-Id: I287a74a81d37e0ebe62d673a3f5651ee5439c0d2
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-09-16 16:40:06 -07:00
Andres Morales 92a8e63165 am 6db31c46: am 19c244c5: am 2b71daef: Merge "Revert "[core][trusty] add gatekeeper module""
* commit '6db31c466796503f6bf13cd1257637846257fbc5':
  Revert "[core][trusty] add gatekeeper module"
2015-09-16 23:18:04 +00:00
Andres Morales 6db31c4667 am 19c244c5: am 2b71daef: Merge "Revert "[core][trusty] add gatekeeper module""
* commit '19c244c51194c9314c8d7802adbf736eaeca0be8':
  Revert "[core][trusty] add gatekeeper module"
2015-09-16 23:09:18 +00:00
Andres Morales 955a808f28 am 5750ff3f: am f0748068: am 9dde5667: Merge "Revert "[core][trusty] add keymaster module""
* commit '5750ff3fb65a09925d9ac110d409145bb9cb21e5':
  Revert "[core][trusty] add keymaster module"
2015-09-16 23:05:10 +00:00
Andres Morales 19c244c511 am 2b71daef: Merge "Revert "[core][trusty] add gatekeeper module""
* commit '2b71daefb2ffe58d35b696f1266f221811d3aad9':
  Revert "[core][trusty] add gatekeeper module"
2015-09-16 23:02:15 +00:00