Tomasz Wasilczyk
2b9dd9e1c5
Merge "Fix typo in radio_metadata_t definition." am: ae770a4728
am: f9026b1059
...
am: b936ca317b
Change-Id: I02bd5feff9041e76e56e0a35cca94c879bb99333
2017-01-12 23:00:33 +00:00
Tomasz Wasilczyk
b936ca317b
Merge "Fix typo in radio_metadata_t definition." am: ae770a4728
...
am: f9026b1059
Change-Id: I434bd0299f1b0a433edb36d82515745c724223bb
2017-01-12 22:58:31 +00:00
Tomasz Wasilczyk
f9026b1059
Merge "Fix typo in radio_metadata_t definition."
...
am: ae770a4728
Change-Id: Ib8f9a1fa915dfa5c0600a70a02674f8d0d7ea677
2017-01-12 22:56:01 +00:00
Tomasz Wasilczyk
ae770a4728
Merge "Fix typo in radio_metadata_t definition."
2017-01-12 22:52:58 +00:00
Josh Gao
bb7261421d
Merge "adb: remove support for legacy f_adb interface." am: 72d4c42cd5
am: 6865111e9c
...
am: 5e0caf8d1b
Change-Id: I96885973331c920ad26b96e016b30f05e4318e78
2017-01-12 21:40:40 +00:00
Alex Deymo
c78efd7113
Merge changes from topic 'host_suffix_cleanup' am: 7e0b322978
am: 130546f2d0
...
am: ec72ff2b89
Change-Id: Idd87bed1d0253e6971cb00dbe098f38a6320f2d9
2017-01-12 21:40:23 +00:00
Alex Deymo
092a732ef2
Remove "_host" and "_static" suffix from libsparse definition. am: b0c395955d
am: 7b8d66e7cc
...
am: 11b65cf3be
Change-Id: I3ed3e1b939006db8cb7e968654c16e393fdce6e9
2017-01-12 21:37:55 +00:00
Alex Deymo
31caef4170
Remove "_static" and "_host" suffix from libext4_utils. am: 705353ae27
am: c8f55cc5ca
...
am: 8e3e4effaa
Change-Id: Ie55012b07cb84ba642ff017ca6bcf74a304dde37
2017-01-12 21:37:48 +00:00
Josh Gao
5e0caf8d1b
Merge "adb: remove support for legacy f_adb interface." am: 72d4c42cd5
...
am: 6865111e9c
Change-Id: Ic78675dffa8b27b8c0c2f17fb51cfa791e7a2143
2017-01-12 21:35:41 +00:00
Alex Deymo
ec72ff2b89
Merge changes from topic 'host_suffix_cleanup' am: 7e0b322978
...
am: 130546f2d0
Change-Id: I6852d065d7a7ecb0a89a8335716a9328c71f3e57
2017-01-12 21:35:25 +00:00
Josh Gao
6865111e9c
Merge "adb: remove support for legacy f_adb interface."
...
am: 72d4c42cd5
Change-Id: Ia23ec996c8ed9b40b23a347d1995197db8d45eb2
2017-01-12 21:33:16 +00:00
Alex Deymo
130546f2d0
Merge changes from topic 'host_suffix_cleanup'
...
am: 7e0b322978
Change-Id: Ie3847326761f7a8c6019f19d8700cd1e9613b34d
2017-01-12 21:33:00 +00:00
Alex Deymo
11b65cf3be
Remove "_host" and "_static" suffix from libsparse definition. am: b0c395955d
...
am: 7b8d66e7cc
Change-Id: Iadac05a03e8a748c2257fb34725f815c278d1a89
2017-01-12 21:32:55 +00:00
Alex Deymo
8e3e4effaa
Remove "_static" and "_host" suffix from libext4_utils. am: 705353ae27
...
am: c8f55cc5ca
Change-Id: Iaccc0685249c1a3a9df46a46d4ee2fd01213bb3c
2017-01-12 21:32:49 +00:00
Alex Deymo
7b8d66e7cc
Remove "_host" and "_static" suffix from libsparse definition.
...
am: b0c395955d
Change-Id: I8ac6f410a42046c18c29fae9a49479dfbd9bb50c
2017-01-12 21:27:53 +00:00
Alex Deymo
c8f55cc5ca
Remove "_static" and "_host" suffix from libext4_utils.
...
am: 705353ae27
Change-Id: I88ab21cc4412d89b831c0d601dbc98fcbcbe4ef4
2017-01-12 21:27:48 +00:00
Josh Gao
72d4c42cd5
Merge "adb: remove support for legacy f_adb interface."
2017-01-12 21:24:34 +00:00
Alex Deymo
7e0b322978
Merge changes from topic 'host_suffix_cleanup'
...
* changes:
Remove "_host" and "_static" suffix from libsparse definition.
Remove "_static" and "_host" suffix from libext4_utils.
2017-01-12 21:23:11 +00:00
Tomasz Wasilczyk
3eba74fec1
Fix typo in radio_metadata_t definition.
...
Test: none, this struct is opaque.
Change-Id: I6b8f5787441618a7a818c7d4595010d241574c13
2017-01-12 11:15:32 -08:00
Prashant Malani
676c9fae14
Merge "fs_mgr: Fix disable-verity for verifyatboot partitions" am: 6bc1d38381
am: ab27993c18
...
am: 6635787941
Change-Id: I37c2c5d200c4c4fe349fdb32f97e1c1158b762d8
2017-01-12 18:12:11 +00:00
Prashant Malani
1fb1823aa8
Merge "fs_mgr: Add support for at-boot verification" am: 82db553dd9
am: e36462f0f5
...
am: de4b9427e1
Change-Id: I2c31c6be028f034693643a3424c477ee9ae45317
2017-01-12 18:11:58 +00:00
Prashant Malani
6635787941
Merge "fs_mgr: Fix disable-verity for verifyatboot partitions" am: 6bc1d38381
...
am: ab27993c18
Change-Id: I7f5e6a917e9bfcbd248ab56477be31561f44eb8e
2017-01-12 18:09:43 +00:00
Prashant Malani
de4b9427e1
Merge "fs_mgr: Add support for at-boot verification" am: 82db553dd9
...
am: e36462f0f5
Change-Id: I9bb39fc3d6052a11a40b57a37b3e2f6b47127b7c
2017-01-12 18:09:29 +00:00
Prashant Malani
ab27993c18
Merge "fs_mgr: Fix disable-verity for verifyatboot partitions"
...
am: 6bc1d38381
Change-Id: I56d6cd59a80f288632ed7ce10ce8178ceb72bec2
2017-01-12 18:07:45 +00:00
Prashant Malani
e36462f0f5
Merge "fs_mgr: Add support for at-boot verification"
...
am: 82db553dd9
Change-Id: I48dc83ed69cb32a4da3df83c72a5eb9d0865b3b2
2017-01-12 18:07:30 +00:00
Treehugger Robot
6bc1d38381
Merge "fs_mgr: Fix disable-verity for verifyatboot partitions"
2017-01-12 18:00:33 +00:00
Treehugger Robot
82db553dd9
Merge "fs_mgr: Add support for at-boot verification"
2017-01-12 17:59:59 +00:00
Alex Deymo
b0c395955d
Remove "_host" and "_static" suffix from libsparse definition.
...
This now combines all the "libsparse" libraries into the same soong
target. A minor side-effect of this change is that the libsparse
static library depends on the libz shared library instead of the libz
static library. This minor change has no effect since targets using
the static libsparse library need to explicitly include either the
static libz or the shared one.
Bug: 34220783
Change-Id: I8f41586cf4c3336791cfa57ab4f5ae59a76d7ffa
2017-01-11 19:15:11 -08:00
Hung-ying Tyan
7e6d30e5f2
init: add ro.boot.init_rc
...
SoC vendors and ODMs need a way to run different init scripts under
different boot modes. This patch adds a new ro.boot.init_rc kernel
cmdline argument to support this.
This patch also changes late-init trigger. Now late-init is only
triggered in "normal" boot (where boot mode is not specified). This is
to make AOSP init.rc re-usable in other boot modes as the operations
in late-init are less common.
Bug: 26639863
Test: Tested on bullhead with
androidboot.init_rc = {non-existent .rc file}
and/or
androidboot.init_rc = {none empty string}
both of which lead to expected boot failures.
Boot succeeds if androidboot.init_rc is not specified.
Change-Id: Ie5f08c3914f2f825ad3c401fde6741459668c523
2017-01-12 10:08:30 +08:00
Paul Lawrence
87b62dc44c
Merge "Set right attributes on tracing folder" am: 5d8bf9e6e2
am: f014e41731
...
am: 36eeceec84
Change-Id: Idd6917f0af39e7b4cb20857cf11c9d2795a47d6e
2017-01-12 01:44:14 +00:00
Paul Lawrence
36eeceec84
Merge "Set right attributes on tracing folder" am: 5d8bf9e6e2
...
am: f014e41731
Change-Id: I000919a98192d639b8797e9c55e49f3cabd5ed4b
2017-01-12 01:38:11 +00:00
Elliott Hughes
a6c65704d6
Fix libbase file.Readlink test on marlin/sailfish.
...
Bug: http://b/33306057
Test: ran tests
Change-Id: Ie6797e71d3507572da66d6b6966f8ee9373124a4
2017-01-11 17:34:40 -08:00
Paul Lawrence
f014e41731
Merge "Set right attributes on tracing folder"
...
am: 5d8bf9e6e2
Change-Id: I9f2b023fe2cd311aa74dde52f0389eb72d80345e
2017-01-12 01:31:44 +00:00
Treehugger Robot
5d8bf9e6e2
Merge "Set right attributes on tracing folder"
2017-01-12 01:24:30 +00:00
Paul Lawrence
3d8ade3f24
Set right attributes on tracing folder
...
Since splitting tracefs out from debugfs, we now need to set the
attributes explicitly on tracing folder.
Test: Run adb shell atrace -c -b 16000 -t 5 gfx
Bug: 34197733
Change-Id: If2a962332b6d1ec227e289bdf952213756e26186
2017-01-11 15:51:25 -08:00
Josh Gao
183b73e665
adb: remove support for legacy f_adb interface.
...
Everything should be using the functionfs interface instead by now.
Bug: http://b/34228376
Test: grepping for f_adb, android_adb in source tree
Test: m
Change-Id: I6bc41049c49a867499832588dac8ed108c636c11
2017-01-11 15:00:03 -08:00
Alex Deymo
705353ae27
Remove "_static" and "_host" suffix from libext4_utils.
...
Bug: 34220783
Change-Id: I967dbaa9c48ad1feed2369c3a40f745b86a350f8
2017-01-11 14:05:42 -08:00
Mark Salyzyn
a45b1d6f38
Merge "liblog: use log/log.h when utilizing ALOG macros" am: 01e12b4ee7
am: c3b346ea93
...
am: 5482cb01b2
Change-Id: Ifaf21912d44f6ee9fda06df255ba3f7a4ca26ed7
2017-01-11 19:26:19 +00:00
Mark Salyzyn
5482cb01b2
Merge "liblog: use log/log.h when utilizing ALOG macros" am: 01e12b4ee7
...
am: c3b346ea93
Change-Id: I0ee5652701e23d751def8bac82534af530ea5dc8
2017-01-11 19:20:50 +00:00
Mark Salyzyn
c3b346ea93
Merge "liblog: use log/log.h when utilizing ALOG macros"
...
am: 01e12b4ee7
Change-Id: Ia2f121c5cec1cee98a51a36fa7c4d2e8a0f544a9
2017-01-11 19:15:19 +00:00
Mark Salyzyn
01e12b4ee7
Merge "liblog: use log/log.h when utilizing ALOG macros"
2017-01-11 19:07:17 +00:00
Mark Salyzyn
30f991f251
liblog: use log/log.h when utilizing ALOG macros
...
Test: compile
Bug: 30465923
Change-Id: Id6d76510819ebd88c3f5003d00d73a0dbe85e943
2017-01-11 09:31:15 -08:00
Neil Fuller
dc78381399
Merge "Change tzdatacheck to account for bundle format changes" am: 6540dfefca
am: 74777579fc
...
am: 2553a20da9
Change-Id: I0032728bc75ed6a6ed4891ed6e1a04282f25e473
2017-01-11 15:13:17 +00:00
Neil Fuller
2553a20da9
Merge "Change tzdatacheck to account for bundle format changes" am: 6540dfefca
...
am: 74777579fc
Change-Id: I120761f03466ec08c926237cb79e45fddd7c8f8f
2017-01-11 15:02:49 +00:00
Neil Fuller
74777579fc
Merge "Change tzdatacheck to account for bundle format changes"
...
am: 6540dfefca
Change-Id: Ia859f50f2c73c1b6900d4b7654ab2a8ba84a6fca
2017-01-11 14:54:01 +00:00
Neil Fuller
6540dfefca
Merge "Change tzdatacheck to account for bundle format changes"
2017-01-11 14:46:47 +00:00
Prashant Malani
17f248d2e4
fs_mgr: Fix disable-verity for verifyatboot partitions
...
This allows a remount to be performed on partitions which have been
verified at boot, without causing the verity service to complain of
"corrupted" blocks that could have been modified as a result of a
remount (while the verity checksum remained unchanged).
(cherry picked from commit dd78ae75ff
)
Bug: 32638755
Test: Compile
Change-Id: I77cf7dd20ee5c5f5dac80f73f292e32583fe5906
2017-01-11 22:05:16 +08:00
Prashant Malani
2cdc67eed5
fs_mgr: Add support for at-boot verification
...
Running dm-verity on heavily accessed partitions leads to performance
slowdowns, especially on low-RAM and slow-CPU devices.
This patch introduces a flag to allow an entire verified partition to be
read once at boot, to check for corruptions. If the reads are
successful, we can mount the partition as raw & read-only, and if not,
we can revert to mounting it as a verity partition, just like before.
Usage of this flag will entail a slowdown of time-to-boot, but should
lead to improvements in runtime performance.
(cherry picked from commit 34543c03e6
)
Bug: 32433608
Test: Compile
Change-Id: I97717683a00ad6fa347e63b72b1a9bf1d2946315
2017-01-11 22:00:25 +08:00
Andre Eisenbach
bb5ca97809
Merge "Allow Bluetooth HAL to access /sys/class/rfkill" am: 6ad690dfd4
am: a398921635
...
am: d969153aad
Change-Id: I2ca2589854e07ff5b77352e6c2cebcb67fa3eee6
2017-01-11 03:07:48 +00:00
Andre Eisenbach
d969153aad
Merge "Allow Bluetooth HAL to access /sys/class/rfkill" am: 6ad690dfd4
...
am: a398921635
Change-Id: I4d4fd3b01a30ffc2bcad7de0413197ed9a93f8ba
2017-01-11 02:51:58 +00:00