Elliott Hughes
c721eccf01
Merge "init: use PLOG rather than strerror." am: 71c084d07e
...
am: f09e388f95
2019-03-08 18:18:42 -08:00
Elliott Hughes
f09e388f95
Merge "init: use PLOG rather than strerror."
...
am: 71c084d07e
2019-03-08 18:14:32 -08:00
Treehugger Robot
71c084d07e
Merge "init: use PLOG rather than strerror."
2019-03-09 02:04:56 +00:00
Wei Wang
1f01e3415e
Merge "Set cg_file_data_ to null when initialization failed" am: f3762004a3
...
am: 94f26c2a1d
2019-03-08 16:25:20 -08:00
Wei Wang
94f26c2a1d
Merge "Set cg_file_data_ to null when initialization failed"
...
am: f3762004a3
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
2019-03-08 15:56:52 -08:00
Xiaoyong Zhou
3c6e86bc11
Merge "Change mini-keyctl command format."
...
am: 34e1b402a6
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
Elliott Hughes
076305e4fb
init: use PLOG rather than strerror.
...
Test: builds
Change-Id: Ifdba8e7fa4cd5c852946bb0f398382f2d64674cd
2019-03-08 12:34:53 -08:00
Josh Gao
4b868d648b
Merge "Restrict scanning port range, not emulator count" am: e6413fcd94
...
am: b4954166ac
2019-03-08 12:10:28 -08:00
Josh Gao
b4954166ac
Merge "Restrict scanning port range, not emulator count"
...
am: e6413fcd94
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
2019-03-08 09:58:47 -08:00
Mark Salyzyn
bd15393281
Merge "fs_mgr: overlay: preserve errno android::gsi::IsGsiRunning()"
...
am: 6c5c085e41
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
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
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
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
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
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
