Elliott Hughes
32ca0ab616
Merge "Remove unused adb_set_transport."
...
am: b898ce00fa
2016-12-03 04:23:10 +00:00
The Android Automerger
9f9a239ca3
Manually merge commit '61e74d7' into stage-aosp-master
...
* commit '61e74d7':
libsparse: add a function to retrieve the data blocks
BUG:33304034wq
2016-12-03 04:05:51 +00:00
Treehugger Robot
b898ce00fa
Merge "Remove unused adb_set_transport."
2016-12-03 02:48:03 +00:00
Treehugger Robot
61e74d7a1b
Merge "libsparse: add a function to retrieve the data blocks"
2016-12-02 22:48:24 +00:00
Elliott Hughes
de80be39aa
Remove unused adb_set_transport.
...
Bug: N/A
Test: builds
Change-Id: I0824d29c080c47e1002abf3520ebed8996bcbcc6
2016-12-02 12:53:09 -08:00
Mark Salyzyn
18f2b9f4c0
Merge "liblog: switch event_tag_map.c to event_tag_map.cpp"
...
am: 48dfc220cb
2016-12-02 17:56:09 +00:00
Mark Salyzyn
48dfc220cb
Merge "liblog: switch event_tag_map.c to event_tag_map.cpp"
2016-12-02 17:51:36 +00:00
James Hawkins
ebe84bbcd4
Merge "bootstat: Fix the boot complete signal for FBE devices."
...
am: 6e5f730243
2016-12-02 01:54:54 +00:00
Treehugger Robot
6e5f730243
Merge "bootstat: Fix the boot complete signal for FBE devices."
2016-12-02 01:46:46 +00:00
Mark Salyzyn
ed9dc8abe2
liblog: switch event_tag_map.c to event_tag_map.cpp
...
NB: recent activities on event_tag_map.c were to allow
this transition to be unremarkable.
Test: compile
Bug: 31456426
Change-Id: I13e1771a001874244711a5ac3023861c2a5f8c7d
2016-12-01 15:42:03 -08:00
James Hawkins
e4079fbdef
bootstat: Fix the boot complete signal for FBE devices.
...
FBE devices suffice with bootanim=stopped, but must be gated on
ro.crypto.type=file.
Bug: 33049941
Test: adb reboot && adb logcat | grep bootstat < Has output
Change-Id: I346d47aaf9d1d4b40f05906056849630b922a20d
2016-12-01 14:02:17 -08:00
Mark Salyzyn
27123d52fc
Merge "liblog: fortify event_log_tags test"
...
am: de07029ad0
2016-12-01 17:45:58 +00:00
Treehugger Robot
de07029ad0
Merge "liblog: fortify event_log_tags test"
2016-12-01 17:24:33 +00:00
Wei Wang
c746ecbcbe
Merge "init: don't wait if we have more work to do"
...
am: 32ee9fc24a
2016-12-01 03:51:19 +00:00
Treehugger Robot
32ee9fc24a
Merge "init: don't wait if we have more work to do"
2016-12-01 03:45:41 +00:00
Adrien Schildknecht
a26a6bd6f3
libsparse: add a function to retrieve the data blocks
...
Test: m libsparse
Change-Id: I04bd3912bb4364e591b064ec2aab782cf02f6bd7
2016-11-30 19:16:28 -08:00
Wei Wang
16db4346a2
init: don't wait if we have more work to do
...
Bug: 33212253
Test: On marlin
Change-Id: I8502eaa73fac6953d358af01482760b3249cfd67
2016-11-30 18:09:29 -08:00
Jin Qian
eee645ec2a
Merge "fs_mgr: support to reserved some blocks for an ext2/3/4 partition."
...
am: bde6ddbbfa
2016-12-01 01:52:43 +00:00
Jin Qian
bde6ddbbfa
Merge "fs_mgr: support to reserved some blocks for an ext2/3/4 partition."
2016-12-01 01:35:37 +00:00
Elliott Hughes
8656ed109b
Merge "Use hasmntopt(3) rather than reinventing the wheel."
...
am: 769a5a1962
2016-11-30 22:49:53 +00:00
Elliott Hughes
769a5a1962
Merge "Use hasmntopt(3) rather than reinventing the wheel."
2016-11-30 22:32:44 +00:00
Mark Salyzyn
3cd9e31446
liblog: fortify event_log_tags test
...
Robustness fortification. Deal with gtest failure if event-log-tags
file is updated, adb sync for example, and thus will report
Shared_Dirty instead of Shared_Clear. Add check for Private_Dirty
and Private_Clean being clear at zero too as a bonus.
Test: gTest liblog-unit-tests --gtest_filter=liblog.event_log_tags
Bug: 31456426
Change-Id: Id912929fdd65499aa532a15653ef387a997a5054
2016-11-30 11:08:46 -08:00
Pirama Arumuga Nainar
66d86967bd
Merge "Statically link LLVM libraries into backtrace_test"
...
am: 9e8467a070
2016-11-30 18:36:16 +00:00
Pirama Arumuga Nainar
473f17cde0
Statically link LLVM libraries into backtrace_test
...
am: c198b150d4
2016-11-30 18:36:14 +00:00
Treehugger Robot
9e8467a070
Merge "Statically link LLVM libraries into backtrace_test"
2016-11-30 18:27:39 +00:00
Elliott Hughes
65016074c2
Merge "init: Fix sync issue on property trigger."
...
am: 80d2f01fbf
2016-11-30 17:54:31 +00:00
Pirama Arumuga Nainar
c198b150d4
Statically link LLVM libraries into backtrace_test
...
Bug: http://b/28866258
Remove dependency of backtrace_test on libLLVM. Also clean up
specification for libbacktrace_offline module. Since it is a static
library now, dependencies are only needed to automatically include
necessary headers.
Test: 32-bit and 64-bit backtrace_test passes on host and on Angler.
mma in system/extras/simpleperf, cts/tests/tests/simpleperf
m test-art-host
Change-Id: I76b0db14d067fa7b140a99edd237370ac04fe873
2016-11-30 17:43:20 +00:00
Elliott Hughes
80d2f01fbf
Merge "init: Fix sync issue on property trigger."
2016-11-30 17:39:55 +00:00
Elliott Hughes
8c1838823a
Use hasmntopt(3) rather than reinventing the wheel.
...
Bug: N/A
Test: "power off" still works
Change-Id: I11d3dc22f98ac71608c9929a3fd43319c787d49e
2016-11-30 09:37:17 -08:00
Mark Salyzyn
6878cd20e6
Merge "libcutils: tests"
...
am: bac388e424
2016-11-30 17:28:39 +00:00
Treehugger Robot
bac388e424
Merge "libcutils: tests"
2016-11-30 17:21:46 +00:00
Oleksiy Avramchenko
8a96f5e4a7
Merge "logcat: Fix --last usage option typo"
...
am: 95a53b8b7a
2016-11-30 17:01:37 +00:00
Treehugger Robot
95a53b8b7a
Merge "logcat: Fix --last usage option typo"
2016-11-30 16:55:23 +00:00
Mark Salyzyn
815e0bd6fa
Merge "liblog: CTS test"
...
am: f1f7333e7c
2016-11-30 16:34:05 +00:00
Treehugger Robot
f1f7333e7c
Merge "liblog: CTS test"
2016-11-30 16:25:11 +00:00
Mark Salyzyn
6b4a2ec603
Merge "liblog: event_tag_map benchmark"
...
am: 4afb3ef952
2016-11-30 15:37:33 +00:00
Treehugger Robot
4afb3ef952
Merge "liblog: event_tag_map benchmark"
2016-11-30 15:31:11 +00:00
Oleksiy Avramchenko
39e2d22b93
logcat: Fix --last usage option typo
...
Test: mm
Change-Id: I0b7a1615857acd4cd467f1ff1752eeae86d84eca
2016-11-30 13:42:14 +01:00
Nick Kralevich
84ccb2dbe0
Merge "ion.c: add O_CLOEXEC to /dev/ion open"
...
am: d91e35fb09
2016-11-30 09:19:16 +00:00
Richard Uhler
3ff028c7db
Merge "debuggerd: Dump list of open files on process crash."
...
am: b675f7cd32
2016-11-30 09:18:57 +00:00
Treehugger Robot
d91e35fb09
Merge "ion.c: add O_CLOEXEC to /dev/ion open"
2016-11-30 07:54:48 +00:00
Treehugger Robot
b675f7cd32
Merge "debuggerd: Dump list of open files on process crash."
2016-11-30 07:53:09 +00:00
Dan Willemsen
695e6182d3
Merge changes Ia0ca36fc,Ib42c0635
...
am: 1abc3cd641
2016-11-30 06:06:07 +00:00
Dan Willemsen
32010171bd
Enable liblog on host bionic
...
am: 0910d2dbb9
2016-11-30 06:06:06 +00:00
Dan Willemsen
69b0123549
Enable libbase/libutils/libziparchive on host bionic
...
am: ab34b47b35
2016-11-30 06:05:59 +00:00
Treehugger Robot
1abc3cd641
Merge changes Ia0ca36fc,Ib42c0635
...
* changes:
Enable liblog on host bionic
Enable libbase/libutils/libziparchive on host bionic
2016-11-30 05:59:53 +00:00
Daniel Rosenberg
895cd44bd9
Merge "Switch sdcardfs over to bind mounts."
...
am: 94b9e4df04
2016-11-30 05:20:40 +00:00
Treehugger Robot
94b9e4df04
Merge "Switch sdcardfs over to bind mounts."
2016-11-30 05:15:33 +00:00
Nick Kralevich
604ed83934
Merge "delete toolbox/r.c"
...
am: 08f0c4c998
2016-11-30 04:32:54 +00:00
Treehugger Robot
08f0c4c998
Merge "delete toolbox/r.c"
2016-11-30 04:27:32 +00:00
