Sandeep Patil
aec9eb017c
Merge "fiemap_writer: Add PinStatus check for fiemap writes." am: db787a0b05
...
am: 49fd889a8a
2019-01-17 19:54:43 -08:00
Sandeep Patil
49fd889a8a
Merge "fiemap_writer: Add PinStatus check for fiemap writes."
...
am: db787a0b05
2019-01-17 19:50:34 -08:00
Treehugger Robot
db787a0b05
Merge "fiemap_writer: Add PinStatus check for fiemap writes."
2019-01-18 03:40:28 +00:00
Cody Schuffelen
dfc2d87c7f
Merge "Combine tcp_connect and socket_spec_connect." am: 539c4d427b
...
am: 6d05846ab0
2019-01-17 18:41:16 -08:00
Cody Schuffelen
6d05846ab0
Merge "Combine tcp_connect and socket_spec_connect."
...
am: 539c4d427b
2019-01-17 18:37:05 -08:00
Cody Schuffelen
539c4d427b
Merge "Combine tcp_connect and socket_spec_connect."
2019-01-18 02:28:50 +00:00
Evgenii Stepanov
18589dbbb0
Merge "Re-enable asan on /init." am: 9c334367fd
...
am: 17d5f8ad20
2019-01-17 18:14:23 -08:00
Evgenii Stepanov
17d5f8ad20
Merge "Re-enable asan on /init."
...
am: 9c334367fd
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
Cody Schuffelen
af0e220fb1
Combine tcp_connect and socket_spec_connect.
...
This will make it easier to add new types of transports by combining the
logic the adb server and adb daemon use to connect to things.
Bug:121166534
Test: adb connect against a cuttlefish instance over the shm proxy.
Change-Id: Ic7fc848c60a85eef968c3735838c87cb7fdaf38b
2019-01-17 15:58:41 -08:00
Sandeep Patil
5ba1c068a2
fiemap_writer: Add PinStatus check for fiemap writes.
...
Note that the check needs the kernel built with latest f2fs.
Bug: 122138114
Test: fiemap_writer_test /dev/block/sda21 \
--gtest_filter=VerifyBlockWritesF2fs.CheckWrites
Change-Id: I0afbc14241f74ed368438a64afbdb97e3376f1f6
Signed-off-by: Sandeep Patil <sspatil@google.com>
2019-01-17 15:57:40 -08:00
Tom Cherry
f096e2d931
Merge "Statically link liblog to logd/logcat and their tests" am: 77d895b739
...
am: f81d1979ff
2019-01-17 15:38:11 -08:00
Jonglin Lee
80af251e39
Merge "init: dump less debug logs when unmount timeout" am: 1945fbef10
...
am: 31cd4f16b2
2019-01-17 15:16:13 -08:00
Tom Cherry
f81d1979ff
Merge "Statically link liblog to logd/logcat and their tests"
...
am: 77d895b739
2019-01-17 15:06:25 -08:00
Jonglin Lee
31cd4f16b2
Merge "init: dump less debug logs when unmount timeout"
...
am: 1945fbef10
2019-01-17 15:03:21 -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
2019-01-17 14:19:51 -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
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
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
2019-01-17 13:53:46 -08:00
Henry Daitx
fbc48702ce
Merge "Disable dexpreopt for deployagent" am: b42719bcd3
...
am: 2494a66c37
2019-01-17 13:29:31 -08:00
Jaegeuk Kim
e44e429b30
Merge "zram: support zram_writeback" am: 2fdbdfddac
...
am: 2c90557d27
2019-01-17 13:25:59 -08:00
Henry Daitx
2494a66c37
Merge "Disable dexpreopt for deployagent"
...
am: b42719bcd3
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
2019-01-17 13:17:17 -08:00
Treehugger Robot
b42719bcd3
Merge "Disable dexpreopt for deployagent"
2019-01-17 21:13:35 +00: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
2019-01-17 13:03:00 -08:00
Martijn Coenen
48ec9e7ce4
Merge "Update AID_ISOLATED_START to include new range."
...
am: 73992c7c00
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
eb9e14663a
Merge "init: Add support for GSI installations in first-stage mount." am: b43440ba79
...
am: ece1e52ae1
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
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
52e4c6919f
Merge "Remove liblog/uio.c and <log/uio.h>" am: e181bf5116
...
am: 788fbbb857
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
2019-01-17 09:37:58 -08:00
Tom Cherry
788fbbb857
Merge "Remove liblog/uio.c and <log/uio.h>"
...
am: e181bf5116
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
2019-01-17 09:29:51 -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
2019-01-17 09:17:25 -08:00
Randall Huang
96b87d510c
Merge "reboot: only run fsck when detecting filesystem inconsistency" am: 91b5adfc88
...
am: a030ede795
2019-01-17 09:15:48 -08:00
Christopher Ferris
27d7e2a3d6
Merge "Add support for UnwinderFromPid object."
...
am: b94c2e52a6
2019-01-17 09:11:48 -08:00
Randall Huang
a030ede795
Merge "reboot: only run fsck when detecting filesystem inconsistency"
...
am: 91b5adfc88
2019-01-17 09:10:23 -08:00
Henry Daitx
05af6aef82
Disable dexpreopt for deployagent
...
platform-tools/deployagent.jar is built incorrectly for userdebug sdk
builds (which the build machines in android-build use). In eng builds
dexpreopt is disable by default, so the file is built correctly.
This change disables dexpreopt for deployagent in all builds, for
consistency.
Bug: 122831369
Test: lunch sdk-eng
Test: make sdk
Change-Id: I370f0536d906690b153f114ba3dd589a14d222d4
2019-01-17 16:24:52 +00:00
Christopher Ferris
b94c2e52a6
Merge "Add support for UnwinderFromPid object."
2019-01-17 16:21:33 +00:00
Randall Huang
91b5adfc88
Merge "reboot: only run fsck when detecting filesystem inconsistency"
2019-01-17 15:03:13 +00:00
