Wei Wang
1f01e3415e
Merge "Set cg_file_data_ to null when initialization failed" am: f3762004a3
...
am: 94f26c2a1d
Change-Id: I7b64cda65e62a982bc3c3c55ba04a7f6979ce396
2019-03-08 16:25:20 -08:00
Wei Wang
94f26c2a1d
Merge "Set cg_file_data_ to null when initialization failed"
...
am: f3762004a3
Change-Id: I32631d26fcf46389c5667db7d6bdf39f64af2a64
2019-03-08 16:21:11 -08:00
Treehugger Robot
f3762004a3
Merge "Set cg_file_data_ to null when initialization failed"
2019-03-09 00:15:05 +00:00
Xiaoyong Zhou
4b0a6092cc
Merge "Change mini-keyctl command format." am: 34e1b402a6
...
am: 3c6e86bc11
Change-Id: I3b668a33eb00811f092b54be1210ff5dbd54413c
2019-03-08 15:56:52 -08:00
Xiaoyong Zhou
3c6e86bc11
Merge "Change mini-keyctl command format."
...
am: 34e1b402a6
Change-Id: I2bcf387368cd93852c9a0d7173cd5e37f49ded78
2019-03-08 15:43:18 -08:00
Treehugger Robot
34e1b402a6
Merge "Change mini-keyctl command format."
2019-03-08 23:17:01 +00:00
Josh Gao
4b868d648b
Merge "Restrict scanning port range, not emulator count" am: e6413fcd94
...
am: b4954166ac
Change-Id: I1b9b249c19eeed8c0a762400d344c4c806626d35
2019-03-08 12:10:28 -08:00
Josh Gao
b4954166ac
Merge "Restrict scanning port range, not emulator count"
...
am: e6413fcd94
Change-Id: I35fc9710f1025c300fc56d989e9735aa10e2bb20
2019-03-08 11:56:23 -08:00
Josh Gao
e6413fcd94
Merge "Restrict scanning port range, not emulator count"
2019-03-08 19:29:43 +00:00
Wei Wang
d71d30179c
Set cg_file_data_ to null when initialization failed
...
Cannot really do calls if initialization failed.
Also fix LOG usage.
But: 124774415
Test: Build
Change-Id: Ifd7db90cfee51ba5830e1d4db8f8d19b5bc9feba
2019-03-08 10:18:06 -08:00
Xiaoyong Zhou
b29b27ec7f
Change mini-keyctl command format.
...
This CL change the mini-keyctl tool to make it compitable with libkeyctl
tool to make it more useful.
Bug: 112038861
Test: mini-keyctl padd asymmetric 'desc' .fs-verity < /path/to/cert.der
Test: mini-keyctl unlink <key_id> <keyring_id>
Test: mini-keyctl restrict_keyring <keyring_id>
Change-Id: I950f07c7718f173823ce5a5cd08e0d1a0e23a007
2019-03-08 09:59:42 -08:00
Mark Salyzyn
07503d3eef
Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()" am: 6c5c085e41
...
am: bd15393281
Change-Id: Iebd9611b2fc18a6fa9f538a0d0be1d596ace0295
2019-03-08 09:58:47 -08:00
Mark Salyzyn
bd15393281
Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()"
...
am: 6c5c085e41
Change-Id: Ifa8e1c4bbdc65b45e7ca2abc0e2271d6daedad64
2019-03-08 09:22:53 -08:00
Mark Salyzyn
6c5c085e41
Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()"
2019-03-08 17:05:03 +00:00
Roland Levillain
fcd734a433
Merge "Fix a typo in linker configuration comments." am: ecef987a35
...
am: 58e3b61d1e
Change-Id: I8ed32707e2c87b1c7808b53f0be93b07c0c87870
2019-03-08 03:58:55 -08:00
Roland Levillain
58e3b61d1e
Merge "Fix a typo in linker configuration comments."
...
am: ecef987a35
Change-Id: I0751095b88ad8acd0e712ee19fdd8d439b63b2d8
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
Change-Id: Ide9e86f4298e10c6885f4c0dc17ea83c7e10e882
2019-03-07 23:03:40 -08:00
Tao Bao
06e721c3e2
Merge "mkbootimg: print addresses and offsets in hex"
...
am: b778c44c07
Change-Id: I37035ea72a49f8ef8ae2a8c7230fb3f9ed502f69
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
Change-Id: I1a742436986ce08235f1d6b5901afd3a33f26d2b
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
Change-Id: I254fc88fa9ab1f343d9d3151459121c438039563
2019-03-07 20:47:26 -08:00
Josh Gao
d9e3421558
Merge "Revert "Revert "adbd: switch the default USB implementation."""
...
am: f97193d96f
Change-Id: I398b7d627745e140263cca4e2835d4ef7bd03f1f
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
Change-Id: I28cbccff6e4d4e75c6baca429ae8a1fc4bf16a3e
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
Change-Id: Ifa52f325897bb2d9f522d07613ed80e619245c94
2019-03-07 14:08:17 -08:00
Matthew Maurer
7e683ff9e4
Merge "Add support for RPMB over VirtIO Serial"
...
am: 2ba61b775a
Change-Id: If61a57f22b1a649cc158448dde205be452477166
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
Change-Id: I638f4ea65a70439ae14d94b6f2138482a41753b3
2019-03-07 13:08:58 -08:00
Mark Salyzyn
27c5047313
fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()
...
Resulted in remount reporting an mount_all failure.
Test: adb-remount-test.sh
Bug: 126256072
Change-Id: Ib9567748e5c12b047e38869c07755eb741308df4
2019-03-07 13:07:17 -08:00
David Anderson
d7b62eb77e
Merge "Add write support to SplitFiemap."
...
am: e9223204d3
Change-Id: I87b7d690df75c53025b39c6d69bf77ca26d81979
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
Change-Id: I3bd3166e79bf8752a9460846067c9c7b1c1d0951
2019-03-07 11:41:19 -08:00
David Anderson
7d5cf4e04c
Merge "Create /metadata/password_slots during boot."
...
am: 1c1850fad2
Change-Id: I93e5b27b47c1aa4431edbda6080f2608559b5435
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
Change-Id: Iedc907e47211ac0867c7a5850edb293618796217
2019-03-07 06:14:12 -08:00
Jiyong Park
7b1d78b008
Merge "Don't defer zygote"
...
am: e820afdadb
Change-Id: I22ef906c81669e54e6d699260dbc1d66d0d582c6
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
Tim Baverstock
25173c808a
Restrict scanning port range, not emulator count
...
Our servers can comfortably run more than 16 emulators, and this is
much easier than messing with hypervisors or docker port allocation.
Assumes you know how to avoid clashes with Google Wear's default port.
Test: manual - still registers emulators.
Change-Id: I47cfd28725a550de0bd77fd11fcd94cdd11d2cc2
2019-03-07 12:28:31 +00:00
Jiyong Park
9069b5cd9c
Merge "Make /apex on ramdisk" am: 96dc80f97a
...
am: 93f1ce510e
Change-Id: I208928407fb44f4ac18159f352cb56a18933c509
2019-03-06 21:15:13 -08:00
Jiyong Park
93f1ce510e
Merge "Make /apex on ramdisk"
...
am: 96dc80f97a
Change-Id: I6fad2e40c683c1e447d02d0338335e53c03d0eb9
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
Change-Id: Ia3353280f106dffd16a4cbdfc05ce110c23fb086
2019-03-06 18:41:35 -08:00
Josh Gao
d659bb49be
Merge "adbd: cleanups in remount/verity."
...
am: 98efc485de
Change-Id: Ideadb9d6633d5529710932e849bdf3a4bc9a9999
2019-03-06 18:37:26 -08:00