Tom Cherry
b3f516b9b5
Merge "init: fix DumpState() logging" am: f31abeb973
am: a968df9edb
...
am: 032f0a2655
Change-Id: I777b0fe5d423add331fd85eee2450a2efa6d1201
2017-03-14 20:24:59 +00:00
Christopher Ferris
29a4783187
Merge "Use the clang format 2 space as default." am: 1252eba600
am: 880f129d36
...
am: 68f84e9210
Change-Id: I21dfc0774c923e06e0ae0f18c3d6744d1fb8f5c4
2017-03-14 20:24:46 +00:00
Tom Cherry
032f0a2655
Merge "init: fix DumpState() logging" am: f31abeb973
...
am: a968df9edb
Change-Id: If589ba5eea3f66cc450f5be13bf7054ae8e89d57
2017-03-14 20:20:27 +00:00
Christopher Ferris
68f84e9210
Merge "Use the clang format 2 space as default." am: 1252eba600
...
am: 880f129d36
Change-Id: Idb79004ca14a9023d9e54a6d944aa266f5f779a3
2017-03-14 20:20:14 +00:00
Tom Cherry
a968df9edb
Merge "init: fix DumpState() logging"
...
am: f31abeb973
Change-Id: I6cacbecb42b594073659960c1d1bd9dea5281b82
2017-03-14 20:16:26 +00:00
Christopher Ferris
880f129d36
Merge "Use the clang format 2 space as default."
...
am: 1252eba600
Change-Id: Ia83d9a096b66b5cea9be84bdc2ed35fdb09c8983
2017-03-14 20:16:14 +00:00
Tom Cherry
f31abeb973
Merge "init: fix DumpState() logging"
2017-03-14 20:12:48 +00:00
Christopher Ferris
1252eba600
Merge "Use the clang format 2 space as default."
2017-03-14 20:11:32 +00:00
Christopher Ferris
87bf2082cf
Use the clang format 2 space as default.
...
Test: NA
Change-Id: I97418804086b83cfba1765eb0bee3e7ca18fb4ea
2017-03-14 13:06:19 -07:00
Jeremy Compostella
0b34d6ff88
Merge "ueventd: support by-name symlinks for virtual block devices" am: 0b4d34e31c
am: 4d003658ec
...
am: 244f447b65
Change-Id: Idf2ec04703de63bf17f0919e08aab98fbedcd81e
2017-03-14 19:47:13 +00:00
Jeremy Compostella
244f447b65
Merge "ueventd: support by-name symlinks for virtual block devices" am: 0b4d34e31c
...
am: 4d003658ec
Change-Id: Id1b3af33eb30212c1569ec8eb6298cb2de477d01
2017-03-14 19:42:42 +00:00
Jeremy Compostella
4d003658ec
Merge "ueventd: support by-name symlinks for virtual block devices"
...
am: 0b4d34e31c
Change-Id: If1d76eab6f535e0296247d7a4c8c56dcf73f24dd
2017-03-14 19:38:13 +00:00
Treehugger Robot
0b4d34e31c
Merge "ueventd: support by-name symlinks for virtual block devices"
2017-03-14 19:29:35 +00:00
Tom Cherry
4f5206d2ea
Merge "init: enable C++17" am: e3aef3dd99
am: e4275b52a8
...
am: fdad550029
Change-Id: I308ea437c7a5faa76e995200a4506cdf7d47e9ea
2017-03-14 17:30:04 +00:00
Tom Cherry
fdad550029
Merge "init: enable C++17" am: e3aef3dd99
...
am: e4275b52a8
Change-Id: I75ce732b58516e45084845da2c42a65c2b31aed1
2017-03-14 17:25:33 +00:00
Tom Cherry
e4275b52a8
Merge "init: enable C++17"
...
am: e3aef3dd99
Change-Id: I2b23cfad2c5a199c48dea513e200bea1f6257253
2017-03-14 17:21:32 +00:00
Tom Cherry
e3aef3dd99
Merge "init: enable C++17"
2017-03-14 17:17:40 +00:00
Christopher Ferris
ba77f5e0cb
Merge "Add a binary to dump demangled names." am: 26afd16917
am: c05ae4824d
...
am: 183e8a8125
Change-Id: Iebff2b90fe72d58e6f96c6e398906580ffc38ce6
2017-03-14 16:59:45 +00:00
Christopher Ferris
183e8a8125
Merge "Add a binary to dump demangled names." am: 26afd16917
...
am: c05ae4824d
Change-Id: Ie5931006dd9cba215ab21234f383b5686ab2793e
2017-03-14 16:54:32 +00:00
Christopher Ferris
c05ae4824d
Merge "Add a binary to dump demangled names."
...
am: 26afd16917
Change-Id: I5aed9fd1577f8e8223c87050bb11ee3fccd3d30c
2017-03-14 16:49:33 +00:00
Christopher Ferris
26afd16917
Merge "Add a binary to dump demangled names."
2017-03-14 16:44:01 +00:00
Mark Salyzyn
b4eed5d38e
Merge changes Iaddc4e1b,I57d84af2 am: fa05eaa968
am: 3790880b9d
...
am: 6764737bda
Change-Id: I58106f3ac62e9160da1aa24cbcb81ae1f3d250c9
2017-03-14 15:01:54 +00:00
Mark Salyzyn
6764737bda
Merge changes Iaddc4e1b,I57d84af2 am: fa05eaa968
...
am: 3790880b9d
Change-Id: I29d44782309a4851605ffd0d0f1f17c4d0860714
2017-03-14 14:56:54 +00:00
Mark Salyzyn
3790880b9d
Merge changes Iaddc4e1b,I57d84af2
...
am: fa05eaa968
Change-Id: Ie83a8c5c72ca15067d2809efdef4b7ff8fe0c4cf
2017-03-14 14:52:26 +00:00
Treehugger Robot
fa05eaa968
Merge changes Iaddc4e1b,I57d84af2
...
* changes:
liblog: test: __android_log_btwrite__android_log_close precharge
logcat: test -v epoch tail time
2017-03-14 14:43:53 +00:00
Ian Pedowitz
681cce3c82
Merge "Revert "get rid of LinearTransform""
2017-03-14 08:15:42 +00:00
Ian Pedowitz
6c942304ed
Revert "get rid of LinearTransform"
...
This reverts commit bcd592053a
.
Bug: 36206160
Test: Fugu compiles, didn't before the revert
Change-Id: Id80fd4ce9db3fce03b049cf81f938187c7ddb8b0
2017-03-14 08:11:41 +00:00
TreeHugger Robot
bd1b6e85f6
Merge "Add ReadOrAgain and WriteOrAgain methods to FuseMessage."
2017-03-14 01:51:12 +00:00
Tom Cherry
b7eee25ab8
Merge "init: Remove custom clang-format" am: e6b05dc683
am: f2ee4c8e4b
...
am: 44919e060d
Change-Id: I3a7b779206c7977662325b340b230d7e08bbf7c4
2017-03-14 01:15:23 +00:00
Tom Cherry
44919e060d
Merge "init: Remove custom clang-format" am: e6b05dc683
...
am: f2ee4c8e4b
Change-Id: Ie6fe9f9ef7caf66d1ef43dd3e15acb4e14818c40
2017-03-14 01:10:21 +00:00
TreeHugger Robot
00e21585d2
Merge "sync: Cache knowledge of kernel uapi version"
2017-03-14 01:09:18 +00:00
Tom Cherry
f2ee4c8e4b
Merge "init: Remove custom clang-format"
...
am: e6b05dc683
Change-Id: I167ead68a8cf23083f3fa240f70fcfe6690a5b9a
2017-03-14 01:05:24 +00:00
Treehugger Robot
e6b05dc683
Merge "init: Remove custom clang-format"
2017-03-14 01:00:37 +00:00
Daichi Hirono
57b780fbc3
Add ReadOrAgain and WriteOrAgain methods to FuseMessage.
...
These methods return kAgain if operation cannot be done without blocking
the current thread.
The CL also introduecs new helper function SetupMessageSockets so that
FuseMessages are always transfered via sockets that save message
boundaries.
Bug: 34903085
Test: libappfuse_test
Change-Id: I34544372cc1b0c7bc9622e581ae16c018a123fa9
2017-03-14 09:09:29 +09:00
Mark Salyzyn
c500abb40b
liblog: test: __android_log_btwrite__android_log_close precharge
...
TEST_PREFIX missing before operations on
liblog*.__android_log_btwrite__android_log_close tests
Test: gTest liblog-unit-tests
Bug: 27405083
Change-Id: Iaddc4e1b1f9afcfd8231c3921605fecefd2b56bf
2017-03-13 16:29:04 -07:00
Mark Salyzyn
210095136d
logcat: test -v epoch tail time
...
Test: gTest logcat-unit-tests
Bug: 35373582
Change-Id: I57d84af2eb5d1fce8753539edf3133bfe0bb7213
2017-03-13 16:29:04 -07:00
Tom Cherry
62a9f32344
init: Remove custom clang-format
...
Use a symlink to .clang-format-4 from the parent directory now that we
have it, instead of the custom .clang-format in this directory.
The changes between these files are,
Old:
ConstructorInitializerAllOnOneLineOrOnePerLine: false
TabWidth: 8
New:
ConstructorInitializerAllOnOneLineOrOnePerLine: true
TabWidth: 4
There is no reason to keep a custom .clang-format for these two
changes, and setting ConstructorInitializerAllOnOneLineOrOnePerLine to
true will be beneficial.
Test: Run clang-format and see that its output is sane
Change-Id: I5b357949eb02a60577cf57a783c0a80997b24e75
2017-03-13 16:23:20 -07:00
Christopher Ferris
a11dc8f962
Add a binary to dump demangled names.
...
Test: Ran the executable and verified names get demangled.
Test: Ran with the -c option to verify it compares demangled names.
Change-Id: I9118ccc4398980346d26f615cdfed0bb756b52fe
2017-03-13 16:10:08 -07:00
Josh Gao
6b34c4a280
Merge "crash_dump: fix warnings, turn on -Werror." am: c5933ed960
am: 8412dac88c
...
am: 2882ed7272
Change-Id: I191b0c2915e532096edeed6ff30862be272a1526
2017-03-13 23:01:02 +00:00
Josh Gao
2882ed7272
Merge "crash_dump: fix warnings, turn on -Werror." am: c5933ed960
...
am: 8412dac88c
Change-Id: I4a5e2a720e5e2f0a17fbf0891372fcd880c13af3
2017-03-13 22:48:29 +00:00
Mark Salyzyn
1598fe03b9
Resolve merge conflicts of e40a08509
to master
...
Test: gTest liblog-unit-tests logd-unit-tests logcat-unit-tests
Bug: 35373582
Bug: 34949125
Bug: 34606909
Change-Id: If6f3f138974913039dd49f2451bad6e413d6e2e1
2017-03-13 15:44:57 -07:00
Josh Gao
8412dac88c
Merge "crash_dump: fix warnings, turn on -Werror."
...
am: c5933ed960
Change-Id: Id658632ea8fedc8598b5ac6939e7e9bf0bd0d22e
2017-03-13 22:43:59 +00:00
Treehugger Robot
c5933ed960
Merge "crash_dump: fix warnings, turn on -Werror."
2017-03-13 22:38:44 +00:00
Mark Salyzyn
e40a085095
Merge "logd: specify clang format" am: eb4a9d9588
...
am: b784ff72ff
Change-Id: I060a270e8c945f02d094d64016cec9ad21193650
2017-03-13 22:24:57 +00:00
Mark Salyzyn
b784ff72ff
Merge "logd: specify clang format"
...
am: eb4a9d9588
Change-Id: Idc8bfe87e590bfc59be8743daddf4b12fb3c1190
2017-03-13 22:20:55 +00:00
Mark Salyzyn
eb4a9d9588
Merge "logd: specify clang format"
2017-03-13 22:13:32 +00:00
TreeHugger Robot
7f454ab30c
Merge "get rid of LinearTransform"
2017-03-13 22:06:15 +00:00
Josh Gao
c7fe0600cc
crash_dump: fix warnings, turn on -Werror.
...
Test: mma
Change-Id: I0722fef7b513be976cbbe89f73e8bb7138a80442
2017-03-13 14:13:29 -07:00
Christopher Ferris
9000550a7b
Merge "Restore errno in signal handlers." am: f161e00289
am: 6f237fda00
...
am: 76434931cd
Change-Id: I073418608f360eaf5d639c7df12e6296e6793d07
2017-03-13 21:06:02 +00:00
Christopher Ferris
76434931cd
Merge "Restore errno in signal handlers." am: f161e00289
...
am: 6f237fda00
Change-Id: I9298a3b5423393705435f92e8f4aeb5806f92714
2017-03-13 21:02:04 +00:00