Commit Graph

17798 Commits

Author SHA1 Message Date
Yabin Cui d716a45f1d am 27b455bb: am 00ea49fc: Merge "Revert "Revert "Revert "Add BacktraceOffline for offline backtracing.""""
* commit '27b455bb0c2dbab7af14c3434438310a38cb64fa':
  Revert "Revert "Revert "Add BacktraceOffline for offline backtracing."""
2015-09-22 01:54:15 +00:00
Yabin Cui 27b455bb0c am 00ea49fc: Merge "Revert "Revert "Revert "Add BacktraceOffline for offline backtracing.""""
* commit '00ea49fc98870470b33041e0b3c3f83c91ff1007':
  Revert "Revert "Revert "Add BacktraceOffline for offline backtracing."""
2015-09-22 01:44:51 +00:00
Yabin Cui 00ea49fc98 Merge "Revert "Revert "Revert "Add BacktraceOffline for offline backtracing."""" 2015-09-22 01:39:46 +00:00
Yabin Cui 94ece83270 Revert "Revert "Revert "Add BacktraceOffline for offline backtracing."""
This reverts commit 0a411c934a.

Change-Id: Ic1824afac6c32f1087b66de9d6368a561f235d13
2015-09-22 01:38:17 +00:00
Mark Salyzyn 3cbc7e7eaa am 6e78a2c5: am 6eec17e3: Merge "logcatd: up size from 16MB to 256MB"
* commit '6e78a2c5b6a052043b01ba36de21e7aec49c8735':
  logcatd: up size from 16MB to 256MB
2015-09-22 00:45:39 +00:00
Mark Salyzyn 6e78a2c5b6 am 6eec17e3: Merge "logcatd: up size from 16MB to 256MB"
* commit '6eec17e35631ad39cc61d7321a301b0c3c8dff11':
  logcatd: up size from 16MB to 256MB
2015-09-21 23:42:37 +00:00
Mark Salyzyn 6eec17e356 Merge "logcatd: up size from 16MB to 256MB" 2015-09-21 23:36:56 +00:00
Mark Salyzyn 44a34e4525 am 96f1b63a: am 44210dfe: Merge "logpersist: bundle with logcatd service"
* commit '96f1b63a916a86774780bc9e15ac857ac3dd6fde':
  logpersist: bundle with logcatd service
2015-09-21 22:31:59 +00:00
Mark Salyzyn 529c2c1c07 am 9c92ad31: am 2f25cb47: Merge "logpersist: Additional barrier"
* commit '9c92ad3125b251109c6537e45d147650756058ca':
  logpersist: Additional barrier
2015-09-21 22:31:57 +00:00
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 36787a37fd am 92db97de: am ebc49654: Merge "Revert "Revert "Add BacktraceOffline for offline backtracing."""
* commit '92db97dea06895b0e22e4ad5fd1152dc24c94efa':
  Revert "Revert "Add BacktraceOffline for offline backtracing.""
2015-09-21 21:36:59 +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
Tom Cherry 984bd8323d resolved conflicts for 5caca3dd to mnc-dr-dev-plus-aosp
Change-Id: I773e514a8232b77cdd566dc36c9efc4e15f206f0
2015-09-21 14:25:34 -07:00
Yabin Cui ebc4965467 Merge "Revert "Revert "Add BacktraceOffline for offline backtracing.""" 2015-09-21 21:08:09 +00:00
Mark Salyzyn 3ffbdb9009 logcatd: up size from 16MB to 256MB
Change-Id: Ic151d42151efdb3103470ba46c626a800cf29125
2015-09-21 13:53:16 -07: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 03581ce1ea am 46a005c3: am 2b5f5fb9: Merge "base logging: fix errno restoring, severity conditionality, dangling ifs"
* commit '46a005c3d9a6557985316a1ee802880e99cc2407':
  base logging: fix errno restoring, severity conditionality, dangling ifs
2015-09-21 20:13:06 +00: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
Tim Murray 5caca3dd89 am a3f45684: Merge "add system-background cpuset" into mnc-dr-dev
* commit 'a3f45684bda7b3a479e480ccb90cc745f8852efd':
  add system-background cpuset
2015-09-21 20:00:56 +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
Tim Murray a3f45684bd Merge "add system-background cpuset" into mnc-dr-dev 2015-09-21 19:40:03 +00:00
Dan Albert 82b9e94173 am 1bcb4677: am 71f878f8: Merge "Move python-adb to development/python-packages."
* commit '1bcb4677b0a9aaf4c62db073bc878a7249c8028c':
  Move python-adb to development/python-packages.
2015-09-21 17:42:11 +00: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
Narayan Kamath 8cbdd1fb9e am f5db0689: am 7fc499bb: am 3f7a33a5: am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
* commit 'f5db0689a0a898194577d456331ef7df936ddd44':
  Follow up to change b638126ed DO NOT MERGE.
2015-09-20 01:37:18 +00:00
Narayan Kamath 84c7ca7002 am 5ce847b2: am 222a1562: am dd0932e8: am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev
* commit '5ce847b26168444724d6653ada89e9658c0bd0ba':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-20 01:37:17 +00:00
Narayan Kamath f5db0689a0 am 7fc499bb: am 3f7a33a5: am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
* commit '7fc499bb7c060d2382517b4d0688a8c76198c0a8':
  Follow up to change b638126ed DO NOT MERGE.
2015-09-20 01:25:06 +00:00
Narayan Kamath 5ce847b261 am 222a1562: am dd0932e8: am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev
* commit '222a15622a63d11783bbc998c2c261adb3ad1bd1':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-20 01:25:06 +00:00
Brian Carlstrom 16bed9650a am 742d0173: am 661600dd: am 110f705e: resolved conflicts for 832a0d1c to mnc-dev
* commit '742d0173e8bd41e137d175c04860c532270b3f5b':
  libutils: Fix integer overflows in VectorImpl.
2015-09-20 01:21:47 +00:00
Brian Carlstrom 742d0173e8 am 661600dd: am 110f705e: resolved conflicts for 832a0d1c to mnc-dev
* commit '661600dd0f0bf48289f69915c6b9844436702a90':
  libutils: Fix integer overflows in VectorImpl.
2015-09-20 01:12:26 +00:00
Narayan Kamath 7fc499bb7c am 3f7a33a5: am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
* commit '3f7a33a5294cd59c331d5d036021141b6f1aef1e':
  Follow up to change b638126ed DO NOT MERGE.
2015-09-20 01:10:10 +00:00
Narayan Kamath 222a15622a am dd0932e8: am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev
* commit 'dd0932e831551d0a57a8af646ac0f9f386e4f579':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-20 01:10:09 +00:00
Brian Carlstrom 661600dd0f am 110f705e: resolved conflicts for 832a0d1c to mnc-dev
* commit '110f705e1077b388a69814e9cdd2907a6ad7d5bb':
  libutils: Fix integer overflows in VectorImpl.
2015-09-20 01:02:27 +00:00
Narayan Kamath 3f7a33a529 am 26d47f26: (-s ours) am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
* commit '26d47f2671e67968ea408417f03844681faf9455':
  Follow up to change b638126ed DO NOT MERGE.
2015-09-20 01:00:25 +00:00
Narayan Kamath dd0932e831 am 81b428f2: am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev
* commit '81b428f27a74f693b7c19b873c3a5a9af69da641':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-20 01:00:24 +00:00
Brian Carlstrom 110f705e10 resolved conflicts for 832a0d1c to mnc-dev
Change-Id: Ic46ee60de7bc500f4e1d5fe841524db80918a8d9
2015-09-19 17:29:42 -07:00
Narayan Kamath 26d47f2671 am 491035ce: am 8253cb04: am 0cc468dc: am fef9dffd: (-s ours) am 6c53de92: Follow up to change b638126ed DO NOT MERGE.
* commit '491035ce1ceec310f98347654ea17cafa6ccb520':
  Follow up to change b638126ed DO NOT MERGE.
2015-09-20 00:08:45 +00:00
Narayan Kamath 81b428f27a am db7d8e96: am 68a78370: am 2e64e959: am a82d6dc3: (-s ours) resolved conflicts for b638126e to klp-modular-dev
* commit 'db7d8e963c54246a2792e91c678bbe00fb2cc3aa':
  libutils: Fix integer overflows in VectorImpl. DO NOT MERGE
2015-09-20 00:08:44 +00:00
Brian Carlstrom 832a0d1c64 resolved conflicts for cf676a86 to lmp-mr1-ub-dev
Change-Id: Ifd9a44777a472ae893f894391bff7ef81456d92c
2015-09-19 16:13:00 -07: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
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
Tim Murray cba6ad7449 add system-background cpuset
add a new cpuset for system services that should not run on
larger cores

bug 24144797

Change-Id: I21a54f0d6b46b3b8bd8c4564b8685c88cfc4a57d
2015-09-18 13:18:49 -07:00