Commit Graph

17027 Commits

Author SHA1 Message Date
Mark Salyzyn 96f1b63a91 am 44210dfe: Merge "logpersist: bundle with logcatd service"
* commit '44210dfe4bec1d62e6bed85b7df2afe020b9190d':
  logpersist: bundle with logcatd service
2015-09-21 22:22:26 +00:00
Mark Salyzyn 9c92ad3125 am 2f25cb47: Merge "logpersist: Additional barrier"
* commit '2f25cb479bea6bf7797a33b06359f71c58b38347':
  logpersist: Additional barrier
2015-09-21 22:22:24 +00:00
Mark Salyzyn 44210dfe4b Merge "logpersist: bundle with logcatd service" 2015-09-21 21:52:59 +00:00
Mark Salyzyn 2f25cb479b Merge "logpersist: Additional barrier" 2015-09-21 21:52:41 +00:00
Yabin Cui 92db97dea0 am ebc49654: Merge "Revert "Revert "Add BacktraceOffline for offline backtracing."""
* commit 'ebc49654671f62eca118f7504239f8627c317535':
  Revert "Revert "Add BacktraceOffline for offline backtracing.""
2015-09-21 21:29:25 +00:00
Yabin Cui ebc4965467 Merge "Revert "Revert "Add BacktraceOffline for offline backtracing.""" 2015-09-21 21:08:09 +00:00
Mark Salyzyn 8c943b6dc8 logpersist: bundle with logcatd service
Bug: 23186545
Change-Id: I130d7c7e120acb372e58aec028f39e161d53628e
2015-09-21 13:53:01 -07:00
Mark Salyzyn 1b9456a1a5 logpersist: Additional barrier
If this shows up on "user" builds, block execution

Change-Id: I2e137d1ff7583ac000b81dee7390b582dfd02095
2015-09-21 13:52:45 -07:00
Yabin Cui 46a005c3d9 am 2b5f5fb9: Merge "base logging: fix errno restoring, severity conditionality, dangling ifs"
* commit '2b5f5fb9d94d13809af6967fb3adb40669ddfb49':
  base logging: fix errno restoring, severity conditionality, dangling ifs
2015-09-21 20:04:54 +00:00
Yabin Cui 2b5f5fb9d9 Merge "base logging: fix errno restoring, severity conditionality, dangling ifs" 2015-09-21 19:56:52 +00:00
Yabin Cui 0a411c934a Revert "Revert "Add BacktraceOffline for offline backtracing.""
This reverts commit ab5e583327.

And statically link llvm libraries on host to remove dependency
on 32-bit llvm shared library which is not included in the prebuilt.

Bug: 22229391

Change-Id: I8210687655ee1809fd820ab2a6ca5dfaf3f9096d
2015-09-21 12:54:45 -07:00
Spencer Low 765ae6bcfc base logging: fix errno restoring, severity conditionality, dangling ifs
Fix LOG() to properly save and restore errno. Test this properly.

Only do logging if severity is >= the minimum.

Fix dangling if statements in CHECK(), CHECK_STR{EQ,NE}(). Test this
properly.

Fix base logging tests on Windows. All libbase_tests now pass on
Windows.

Change place to lock, so the lock can protect logging of all data in
LogMessage.

Change-Id: I7ff531c67ae10a99ef0a2bbfe279aa77282d5ae9
Signed-off-by: Spencer Low <CompareAndSwap@gmail.com>
2015-09-21 12:46:12 -07:00
Dan Albert 1bcb4677b0 am 71f878f8: Merge "Move python-adb to development/python-packages."
* commit '71f878f89b6bc6df960e857836467a059802c61e':
  Move python-adb to development/python-packages.
2015-09-21 17:34:29 +00:00
Dan Albert 71f878f89b Merge "Move python-adb to development/python-packages." 2015-09-21 17:26:15 +00:00
Dan Albert 8858883388 Move python-adb to development/python-packages.
We want to be able to use this in the NDK without having to pull in
all of system core.

Also, this clarifies the separation of adb and its python interface.

Bug: http://b/22881740
Change-Id: I0b437d9bf621e371d4698d7f8e8828072c7ff347
2015-09-18 13:39:13 -07: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 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 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 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 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
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 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 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 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 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 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
Dan Willemsen 63aa47afd7 Add Android.bp for liblog
Change-Id: Ibbb476a5e6b247cba96929e683727c25f66d90f0
2015-09-16 15:59:22 -07:00
Andres Morales 2b71daefb2 Merge "Revert "[core][trusty] add gatekeeper module"" 2015-09-16 22:54:14 +00:00
Andres Morales 1a1474caf2 Revert "[core][trusty] add gatekeeper module"
This reverts commit 6ee0f94adf.

Change-Id: I673103c60f43b409cc72176c9450883336831cae
2015-09-16 22:53:49 +00:00
Andres Morales f07480681d am 9dde5667: Merge "Revert "[core][trusty] add keymaster module""
* commit '9dde56672b003d862f253711b023e3d3d675443b':
  Revert "[core][trusty] add keymaster module"
2015-09-16 22:50:36 +00:00
Andres Morales 9dde56672b Merge "Revert "[core][trusty] add keymaster module"" 2015-09-16 22:45:06 +00:00
Andres Morales 8ea9657ccd Revert "[core][trusty] add keymaster module"
This reverts commit 748b690415.

Change-Id: Ic65ce4af2d2f811129d941069dcd70e814c18f36
2015-09-16 22:44:34 +00:00
Andres Morales ee47386aa3 am 0e26977c: Merge changes from topic \'trusty-gk-km\'\'
* commit '0e26977c56c53a4ffc65d1680bbad4478c23111c':
  [core][trusty] add gatekeeper module
  [core][trusty] add keymaster module
2015-09-16 22:03:18 +00:00
Michael Ryleev c7c9451f98 am ebbbb7c6: Merge "Add libtrusty and corresponding test utility"
* commit 'ebbbb7c677a5c0c269be30ebaf9486513f2f8aff':
  Add libtrusty and corresponding test utility
2015-09-16 22:03:16 +00:00