Evgenii Stepanov
a2cdc6ae3c
Merge "Re-enable asan on /init." am: 9c334367fd am: 17d5f8ad20
...
am: 18589dbbb0
Change-Id: I381f49e2d7fc829f357d38d134a30bfaa46ca911
2019-01-17 18:25:01 -08:00
Evgenii Stepanov
18589dbbb0
Merge "Re-enable asan on /init." am: 9c334367fd
...
am: 17d5f8ad20
Change-Id: I36232326fbd18d6d8e065f2fd133c3a7ad6cd8b9
2019-01-17 18:14:23 -08:00
Evgenii Stepanov
17d5f8ad20
Merge "Re-enable asan on /init."
...
am: 9c334367fd
Change-Id: I2fc6aee86292034ae32136f430d5de3ae5d9c448
2019-01-17 18:10:13 -08:00
Treehugger Robot
9c334367fd
Merge "Re-enable asan on /init."
2019-01-18 01:56:43 +00:00
Tom Cherry
9644a837ae
Merge "Statically link liblog to logd/logcat and their tests" am: 77d895b739 am: f81d1979ff
...
am: f096e2d931
Change-Id: I4a2a84a56fb772b9223165869e50849642ea29b3
2019-01-17 16:18:33 -08:00
Jonglin Lee
123301b5bd
Merge "init: dump less debug logs when unmount timeout" am: 1945fbef10 am: 31cd4f16b2
...
am: 80af251e39
Change-Id: I226294f33f09cc90b50a98febe21a5583adcb3e5
2019-01-17 15:39:15 -08:00
Tom Cherry
f096e2d931
Merge "Statically link liblog to logd/logcat and their tests" am: 77d895b739
...
am: f81d1979ff
Change-Id: Iaa45652fd1d1b2c16ba454c5df299967568f26ac
2019-01-17 15:38:11 -08:00
Jonglin Lee
80af251e39
Merge "init: dump less debug logs when unmount timeout" am: 1945fbef10
...
am: 31cd4f16b2
Change-Id: Ibf8223ec0469305a97cd4a2caf4323c50b168e05
2019-01-17 15:16:13 -08:00
Tom Cherry
f81d1979ff
Merge "Statically link liblog to logd/logcat and their tests"
...
am: 77d895b739
Change-Id: I68cdff95f0143b87d9d4453aa350ad1720637e58
2019-01-17 15:06:25 -08:00
Jonglin Lee
31cd4f16b2
Merge "init: dump less debug logs when unmount timeout"
...
am: 1945fbef10
Change-Id: I78380e8ed273612698da63391c0c7bb103bed806
2019-01-17 15:03:21 -08:00
Xin Li
326d649066
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master" am: c541731521 -s ours am: 51d6a3cf71 -s ours
...
am: a36f0bc4c0 -s ours
am skip reason: subject contains skip directive
Change-Id: I071535acec92b75dbb30b7ee74e44eec38070d60
2019-01-17 14:30:09 -08:00
Tom Cherry
77d895b739
Merge "Statically link liblog to logd/logcat and their tests"
2019-01-17 22:27:43 +00:00
Xin Li
a36f0bc4c0
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master" am: c541731521 -s ours
...
am: 51d6a3cf71 -s ours
am skip reason: subject contains skip directive
Change-Id: If3ee4d79eb874ec3a22953adb950224fa80f6d54
2019-01-17 14:19:51 -08:00
Xin Li
a8b9dbf8aa
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master am: 43a0d67e7b -s ours am: fc58695ebf -s ours
...
am: a9edfd12f7 -s ours
am skip reason: subject contains skip directive
Change-Id: Id2450099a2929fb4509d4ae92a9bf555f53677c6
2019-01-17 14:18:59 -08:00
Treehugger Robot
1945fbef10
Merge "init: dump less debug logs when unmount timeout"
2019-01-17 22:06:50 +00:00
Xin Li
a9edfd12f7
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master am: 43a0d67e7b -s ours
...
am: fc58695ebf -s ours
am skip reason: subject contains skip directive
Change-Id: Ia28f8dc9a928b0edeff0d85b5598f303ba754e98
2019-01-17 14:05:52 -08:00
Evgenii Stepanov
dd02fa162d
Re-enable asan on /init.
...
Fixed in the new toolchain.
Bug: 120561310
Test: asan build boots
Change-Id: I722c98467ed0ac5e18441cb659f26cd8a803eee0
2019-01-17 14:05:22 -08:00
Xin Li
51d6a3cf71
[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master"
...
am: c541731521 -s ours
am skip reason: subject contains skip directive
Change-Id: I2b572df6c4f99921c15bc65c432582cb312f1a17
2019-01-17 13:58:46 -08:00
Xin Li
fc58695ebf
[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master
...
am: 43a0d67e7b -s ours
am skip reason: subject contains skip directive
Change-Id: I3c4642ba3de24ad4f1b512430ead06fc3b52aa3f
2019-01-17 13:53:46 -08:00
Henry Daitx
16bfa58f6a
Merge "Disable dexpreopt for deployagent" am: b42719bcd3 am: 2494a66c37
...
am: fbc48702ce
Change-Id: I6a64a96f7cd93276d8d81e0e0a55f43548613a80
2019-01-17 13:46:15 -08:00
Jaegeuk Kim
317de608c1
Merge "zram: support zram_writeback" am: 2fdbdfddac am: 2c90557d27
...
am: e44e429b30
Change-Id: I1766a2a515afd4f35b123b194031cf441f499fc8
2019-01-17 13:29:43 -08:00
Henry Daitx
fbc48702ce
Merge "Disable dexpreopt for deployagent" am: b42719bcd3
...
am: 2494a66c37
Change-Id: I878d824bfd54a50eab144cafb8687be343ed110b
2019-01-17 13:29:31 -08:00
Jaegeuk Kim
e44e429b30
Merge "zram: support zram_writeback" am: 2fdbdfddac
...
am: 2c90557d27
Change-Id: I67b48ca58248c564c71ba233dfd3289732de1c42
2019-01-17 13:25:59 -08:00
Henry Daitx
2494a66c37
Merge "Disable dexpreopt for deployagent"
...
am: b42719bcd3
Change-Id: Id6c190730f028c3cbf7c29917640796fe8c29419
2019-01-17 13:24:22 -08:00
Xin Li
c541731521
Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.190105.001) into master"
2019-01-17 21:19:43 +00:00
Jaegeuk Kim
2c90557d27
Merge "zram: support zram_writeback"
...
am: 2fdbdfddac
Change-Id: I57bb13eb054fcf441485fa380a9f3091864f550f
2019-01-17 13:17:17 -08:00
Treehugger Robot
b42719bcd3
Merge "Disable dexpreopt for deployagent"
2019-01-17 21:13:35 +00:00
Martijn Coenen
0545077db3
Merge "Update AID_ISOLATED_START to include new range." am: 73992c7c00 am: 48ec9e7ce4
...
am: c3be3e8b2a
Change-Id: I3236f694c05ca7c2982930c3090a1806ff70cdcf
2019-01-17 13:07:15 -08:00
Jaegeuk Kim
2fdbdfddac
Merge "zram: support zram_writeback"
2019-01-17 21:03:15 +00:00
Martijn Coenen
c3be3e8b2a
Merge "Update AID_ISOLATED_START to include new range." am: 73992c7c00
...
am: 48ec9e7ce4
Change-Id: I4c95bf99639aeb3e22f6260f2905ba6f5ce592ad
2019-01-17 13:03:00 -08:00
Martijn Coenen
48ec9e7ce4
Merge "Update AID_ISOLATED_START to include new range."
...
am: 73992c7c00
Change-Id: I96a80abc0046b0a1023d6ba14985baa22a829782
2019-01-17 12:58:41 -08:00
Martijn Coenen
73992c7c00
Merge "Update AID_ISOLATED_START to include new range."
2019-01-17 20:49:19 +00:00
Tom Cherry
9e12433760
Statically link liblog to logd/logcat and their tests
...
logd/logcat use more symbols than the rest of the platform, so let's
statically link them for now while we understand the API that the
platform overall uses.
Test: build
Change-Id: I21ae1bd3ff9b310f099612fbe790f769712661df
2019-01-17 11:37:22 -08:00
David Anderson
01031f726a
Merge "init: Add support for GSI installations in first-stage mount." am: b43440ba79 am: ece1e52ae1
...
am: eb9e14663a
Change-Id: If13e1e3dc4d6ede6ad46c3957bb4e1afcbe0d548
2019-01-17 11:32:00 -08:00
David Anderson
eb9e14663a
Merge "init: Add support for GSI installations in first-stage mount." am: b43440ba79
...
am: ece1e52ae1
Change-Id: I33a278e8bcfd2cec1b494730d5e94f28ce06bdd4
2019-01-17 11:15:57 -08:00
Jonglin Lee
28a2c9213b
init: dump less debug logs when unmount timeout
...
Dump only uninterruptible tasks instead of all tasks when
unmount timeout. Also dump current CPU stack traces.
Bug: 122858312
Test: Reboot with and without timeout
Change-Id: I1412ace022b6d78e25fbe1337d1082d4be9c19c0
2019-01-17 19:14:46 +00:00
David Anderson
ece1e52ae1
Merge "init: Add support for GSI installations in first-stage mount."
...
am: b43440ba79
Change-Id: Ia7645c06af6f04da3c357fd5562cc6925d56da1b
2019-01-17 10:57:25 -08:00
David Anderson
b43440ba79
Merge "init: Add support for GSI installations in first-stage mount."
2019-01-17 18:42:58 +00:00
Tom Cherry
7a7dff338a
Merge "Remove liblog/uio.c and <log/uio.h>" am: e181bf5116 am: 788fbbb857
...
am: 52e4c6919f
Change-Id: I05978fc154274c5b13a7fa6b8eeb6b62ace2914a
2019-01-17 09:48:06 -08:00
Tom Cherry
0d11dcfd78
Merge "Remove __android_log_event_list and the reader aspect of android_log_event_list" am: 065854748e am: a64a16aa40
...
am: a6034e5338
Change-Id: I50e02f295bcd5d19e6270f46b350dc10e235af9d
2019-01-17 09:47:06 -08:00
Tom Cherry
52e4c6919f
Merge "Remove liblog/uio.c and <log/uio.h>" am: e181bf5116
...
am: 788fbbb857
Change-Id: I1076c05899b71443556f5bdb30960a4b3ff907c5
2019-01-17 09:38:51 -08:00
Tom Cherry
a6034e5338
Merge "Remove __android_log_event_list and the reader aspect of android_log_event_list" am: 065854748e
...
am: a64a16aa40
Change-Id: I4b89c0588ced37b51e60a28671682c77c1992e2e
2019-01-17 09:37:58 -08:00
Tom Cherry
788fbbb857
Merge "Remove liblog/uio.c and <log/uio.h>"
...
am: e181bf5116
Change-Id: Iee8f6d1c3d3111b890e22241b255ca1e74d58a02
2019-01-17 09:30:30 -08:00
Tom Cherry
a64a16aa40
Merge "Remove __android_log_event_list and the reader aspect of android_log_event_list"
...
am: 065854748e
Change-Id: Id421a042d7dcc83d6c70311a726dd677af4886c8
2019-01-17 09:29:51 -08:00
Christopher Ferris
23040c2511
Merge "Add support for UnwinderFromPid object." am: b94c2e52a6 am: 27d7e2a3d6
...
am: 4664997faf
Change-Id: I5f7bcce995a6658b7bdbec8088da86298d19078b
2019-01-17 09:25:16 -08:00
Randall Huang
2453c029b5
Merge "reboot: only run fsck when detecting filesystem inconsistency" am: 91b5adfc88 am: a030ede795
...
am: 96b87d510c
Change-Id: I17b53b5d7b9bc091fc9b67fc334c94e17826ff22
2019-01-17 09:23:00 -08:00
Tom Cherry
e181bf5116
Merge "Remove liblog/uio.c and <log/uio.h>"
2019-01-17 17:19:52 +00:00
Tom Cherry
065854748e
Merge "Remove __android_log_event_list and the reader aspect of android_log_event_list"
2019-01-17 17:18:10 +00:00
Christopher Ferris
4664997faf
Merge "Add support for UnwinderFromPid object." am: b94c2e52a6
...
am: 27d7e2a3d6
Change-Id: I437369a8bfb0673a3ea88244660ff07b3c69705c
2019-01-17 09:17:25 -08:00
Randall Huang
96b87d510c
Merge "reboot: only run fsck when detecting filesystem inconsistency" am: 91b5adfc88
...
am: a030ede795
Change-Id: Ideab753a0b71dcb5cf26e3f05679497cc204da96
2019-01-17 09:15:48 -08:00