Roland Levillain
fcd734a433
Merge "Fix a typo in linker configuration comments." am: ecef987a35
...
am: 58e3b61d1e
2019-03-08 03:58:55 -08:00
Roland Levillain
58e3b61d1e
Merge "Fix a typo in linker configuration comments."
...
am: ecef987a35
2019-03-08 03:55:48 -08:00
Roland Levillain
ecef987a35
Merge "Fix a typo in linker configuration comments."
2019-03-08 11:48:43 +00:00
Tao Bao
e46b232209
Merge "mkbootimg: print addresses and offsets in hex" am: b778c44c07
...
am: 06e721c3e2
2019-03-07 23:03:40 -08:00
Tao Bao
06e721c3e2
Merge "mkbootimg: print addresses and offsets in hex"
...
am: b778c44c07
2019-03-07 22:59:30 -08:00
Tao Bao
b778c44c07
Merge "mkbootimg: print addresses and offsets in hex"
2019-03-08 06:31:05 +00:00
Josh Gao
3fafb971d9
Merge "Revert "Revert "adbd: switch the default USB implementation.""" am: f97193d96f
...
am: d9e3421558
2019-03-07 20:53:32 -08:00
Dongwon Kang
3642244f9d
Merge "allow_all_shared_libs for media namespace in ld.config.legacy.txt" am: fc6e441a1a
...
am: 6cec105df9
2019-03-07 20:47:26 -08:00
Josh Gao
d9e3421558
Merge "Revert "Revert "adbd: switch the default USB implementation."""
...
am: f97193d96f
2019-03-07 20:42:02 -08:00
Dongwon Kang
6cec105df9
Merge "allow_all_shared_libs for media namespace in ld.config.legacy.txt"
...
am: fc6e441a1a
2019-03-07 20:19:50 -08:00
Treehugger Robot
f97193d96f
Merge "Revert "Revert "adbd: switch the default USB implementation."""
2019-03-08 03:29:41 +00:00
Dongwon Kang
fc6e441a1a
Merge "allow_all_shared_libs for media namespace in ld.config.legacy.txt"
2019-03-08 02:46:06 +00:00
Matthew Maurer
ea1244a5c9
Merge "Add support for RPMB over VirtIO Serial" am: 2ba61b775a
...
am: 7e683ff9e4
2019-03-07 14:08:17 -08:00
Matthew Maurer
7e683ff9e4
Merge "Add support for RPMB over VirtIO Serial"
...
am: 2ba61b775a
2019-03-07 14:04:07 -08:00
Matthew Maurer
2ba61b775a
Merge "Add support for RPMB over VirtIO Serial"
2019-03-07 21:30:56 +00:00
David Anderson
ffebd27e04
Merge "Add write support to SplitFiemap." am: e9223204d3
...
am: d7b62eb77e
2019-03-07 13:08:58 -08:00
David Anderson
d7b62eb77e
Merge "Add write support to SplitFiemap."
...
am: e9223204d3
2019-03-07 12:40:55 -08:00
David Anderson
e9223204d3
Merge "Add write support to SplitFiemap."
2019-03-07 19:55:48 +00:00
David Anderson
c31a6f760c
Merge "Create /metadata/password_slots during boot." am: 1c1850fad2
...
am: 7d5cf4e04c
2019-03-07 11:41:19 -08:00
David Anderson
7d5cf4e04c
Merge "Create /metadata/password_slots during boot."
...
am: 1c1850fad2
2019-03-07 11:14:07 -08:00
Roland Levillain
e51c87634a
Fix a typo in linker configuration comments.
...
Test: n/a
Change-Id: I3fa36094cf3eb45b0e1400712f22b8477a096b59
2019-03-07 19:06:57 +00:00
Dongwon Kang
787e09a1de
allow_all_shared_libs for media namespace in ld.config.legacy.txt
...
This is a temporal fix. With this change, the extractor plug-ins uses
unstable libs under /system/lib[64]. The right resolution is being
discussed.
Test: applied the same change to ld.config.txt and checked
the memory map of media.extractor on cuttlefish.
Bug: 127791685
Change-Id: Ifd5b79831f27ef4017bb8aa774671aa9b2c5264e
2019-03-07 10:14:02 -08:00
David Anderson
1c1850fad2
Merge "Create /metadata/password_slots during boot."
2019-03-07 16:20:01 +00:00
Jiyong Park
69eaa6b07b
Merge "Don't defer zygote" am: e820afdadb
...
am: 7b1d78b008
2019-03-07 06:14:12 -08:00
Jiyong Park
7b1d78b008
Merge "Don't defer zygote"
...
am: e820afdadb
2019-03-07 06:10:03 -08:00
Treehugger Robot
e820afdadb
Merge "Don't defer zygote"
2019-03-07 13:59:17 +00:00
Jiyong Park
1a789db2e3
Don't defer zygote
...
Removing 'updatable' from zygote as zygote is started after apexd. All
APEXes are guaranteed to be activated at the moment.
Sequence of actions:
1) /data mounted. post-fs-data is triggered.
2) apexd starts. APEXes are activated. Init does not execute more
commands until the activation finishes.
3) all post-fs-data sections from other *.rc are executed.
4) zygote-start is triggered.
Bug: 123404717
Bug: 126555629
Bug: 125549215
Test: device boots
Test: no following message on the logcat log
Could not restart 'zygote': Cannot start an updatable service 'zygote' before configs from APEXes are all loaded. Queued for execution.
Merged-In: Ib4d0716ed5225b6ade3adaa247ff6140a9b2b9d5
Change-Id: Ib4d0716ed5225b6ade3adaa247ff6140a9b2b9d5
(cherry picked from commit 3bddd540dd
2019-03-07 22:21:32 +09:00
Jiyong Park
9069b5cd9c
Merge "Make /apex on ramdisk" am: 96dc80f97a
...
am: 93f1ce510e
2019-03-06 21:15:13 -08:00
Jiyong Park
93f1ce510e
Merge "Make /apex on ramdisk"
...
am: 96dc80f97a
2019-03-06 21:11:07 -08:00
Yuvraj Saxena
bc5a0ecd8a
mkbootimg: print addresses and offsets in hex
...
Change-Id: Ia8a8d68acd8d68750f9ae49ccd341f0f4d3f4e9c
2019-03-07 05:06:09 +00:00
Treehugger Robot
96dc80f97a
Merge "Make /apex on ramdisk"
2019-03-07 05:03:05 +00:00
David Anderson
6b4b265abf
Add write support to SplitFiemap.
...
This adds few new methods to introduce write support to SplitFiemap:
(1) Write(), which has an internal cursor to stream data into the split
files. As the end of one file is reached, the next is opened.
(2) Flush(), which calls fsync() on each internal FiemapWriter.
(3) HasPinnedExtents(), which calls the same on each internal
FiemapWriter.
Included are some tests for edge cases in Write().
Bug: 126230649
Test: fiemap_writer_test gtest
Change-Id: I9fd509215975dbbb20a44b020315d3c1b287d1a0
2019-03-06 19:32:20 -08:00
Josh Gao
b7dc01a570
Merge "adbd: cleanups in remount/verity." am: 98efc485de
...
am: d659bb49be
2019-03-06 18:41:35 -08:00
Josh Gao
d659bb49be
Merge "adbd: cleanups in remount/verity."
...
am: 98efc485de
2019-03-06 18:37:26 -08:00
Josh Gao
98efc485de
Merge "adbd: cleanups in remount/verity."
2019-03-07 02:32:42 +00:00
Jiyong Park
e5dc674a95
Make /apex on ramdisk
...
Bug: 127576519
Bug: 127653919
Test: build hikey, check ramdisk has /apex directory
Change-Id: I4e844caa032c0717bd36d323675852ce3681fb01
2019-03-07 11:17:44 +09:00
Sudheer Shanka
5abe405b9e
Merge "Allow callers to pass a flag to not link obb dirs of multiple users." am: 0c8b8af74a
...
am: 5a8d603d9d
2019-03-06 17:02:15 -08:00
Sudheer Shanka
5a8d603d9d
Merge "Allow callers to pass a flag to not link obb dirs of multiple users."
...
am: 0c8b8af74a
2019-03-06 16:46:51 -08:00
Sudheer Shanka
0c8b8af74a
Merge "Allow callers to pass a flag to not link obb dirs of multiple users."
2019-03-07 00:34:59 +00:00
Tao Bao
189e4a7c26
Merge "mkbootimg: extract to 'second' if size not 0" am: a3d394e9bb
...
am: 9130f5c950
2019-03-06 15:33:43 -08:00
Mark Salyzyn
0530d529a9
Merge changes I3506c8e7,I198c0e8c,I8a5d4e36 am: 6bd04c1570
...
am: 492ae86814
2019-03-06 15:29:57 -08:00
Tao Bao
9130f5c950
Merge "mkbootimg: extract to 'second' if size not 0"
...
am: a3d394e9bb
2019-03-06 14:53:04 -08:00
Tao Bao
a3d394e9bb
Merge "mkbootimg: extract to 'second' if size not 0"
2019-03-06 22:43:33 +00:00
Mark Salyzyn
492ae86814
Merge changes I3506c8e7,I198c0e8c,I8a5d4e36
...
am: 6bd04c1570
2019-03-06 14:40:21 -08:00
Treehugger Robot
6bd04c1570
Merge changes I3506c8e7,I198c0e8c,I8a5d4e36
...
* changes:
fs_mgr: remount: automatically disable verity
fs_mgr: remount: pull root device from fstab
fs_mgr: test: track device active slot throughout
2019-03-06 21:53:52 +00:00
Josh Gao
3ed90b75da
adbd: cleanups in remount/verity.
...
1. Don't clear O_CLOEXEC on an fd we're duping to stdin/out/err: dup2
does that for us if oldfd != newfd, and we know the fd can't be
stdin/out/err.
2. Use unique_fd.
3. Remove gotos by breaking the remount logic into its own function.
Test: mma
Change-Id: If9929e7f20de445322fd498e1379a2d4e572cb52
2019-03-06 13:03:30 -08:00
Jiyong Park
504ba80ad7
Merge "Access apex sysprops via the generated API" am: 51deeb569f
...
am: 7c8576d435
2019-03-06 10:10:11 -08:00
Jiyong Park
7c8576d435
Merge "Access apex sysprops via the generated API"
...
am: 51deeb569f
2019-03-06 09:51:44 -08:00
Treehugger Robot
51deeb569f
Merge "Access apex sysprops via the generated API"
2019-03-06 17:38:46 +00:00
Florian Mayer
449355f920
Merge "Fix copy / move behaviour of Maps object." am: 30c898f1ca
...
am: 7e345a00a1
2019-03-06 08:50:41 -08:00
