Commit graph

45381 commits

Author SHA1 Message Date
Xiaoyong Zhou
8307c34ed7 Merge "install mini-keyctl to /system/bin"
am: 055b549497

Change-Id: I23082ded5f70955fcf85468bf4a50eb140e9ac04
2019-01-31 19:55:12 -08:00
Treehugger Robot
055b549497 Merge "install mini-keyctl to /system/bin" 2019-02-01 03:44:48 +00:00
Bowgo Tsai
b20bf7566c Merge "Support getting public key data"
am: 66e76443a0

Change-Id: I0e20abf7b46b51aac02fff6cb4eab7e039cbd7a2
2019-01-31 15:42:49 -08:00
Treehugger Robot
66e76443a0 Merge "Support getting public key data" 2019-01-31 23:29:19 +00:00
Xiaoyong Zhou
cf5dbc200b install mini-keyctl to /system/bin
This CL installs mini-keyctl for fsverity

Bug: 112038861
Test: build, flash and check mini-keyctl is properly installed.
Change-Id: Ib3adc1b7c92cae28caf72544987c7f3f23eafbbc
2019-01-31 13:48:04 -08:00
Josh Gao
a2e6417840 Merge changes If8747ba1,Id1943ebd
am: 69ba5179f4

Change-Id: I2bf0d93e49d1331589d71efb98ce89a9822c7064
2019-01-31 13:31:34 -08:00
Martin Stjernholm
27b6f13af2 Merge "Make libnative*.so from the Runtime APEX libs accessible to vendor binaries."
am: d664c9d952

Change-Id: Ie0357f9de6525ad40ca1f25a05f19f4d96755af7
2019-01-31 13:30:05 -08:00
Josh Gao
69ba5179f4 Merge changes If8747ba1,Id1943ebd
* changes:
  adb: improve network_connect error messages.
  adbd: fix TCP bind address.
2019-01-31 21:19:45 +00:00
Treehugger Robot
d664c9d952 Merge "Make libnative*.so from the Runtime APEX libs accessible to vendor binaries." 2019-01-31 21:15:28 +00:00
Tom Cherry
0bc62d5680 Merge "Add android::fs_mgr namespace for new Fstab code"
am: 54ea49ba05

Change-Id: Ib83279bf830c8662586c10f805f3b6e951936ac4
2019-01-31 11:51:14 -08:00
Tom Cherry
54ea49ba05 Merge "Add android::fs_mgr namespace for new Fstab code" 2019-01-31 19:35:54 +00:00
Pete Bentley
e29eba6ce1 Merge "Export libjavacore into the conscrypt linker namespace."
am: 43c17b0c03

Change-Id: I1c77c95f7c4d1038e8607eab520214f18045c5d5
2019-01-31 11:31:32 -08:00
Treehugger Robot
43c17b0c03 Merge "Export libjavacore into the conscrypt linker namespace." 2019-01-31 19:15:22 +00:00
David Anderson
75e9ef5252 Merge "fastboot: Fix "fastboot gsi"."
am: b7062df8c0

Change-Id: I1e9e050eace8e3a03ead0a77be34694548113c26
2019-01-31 10:18:41 -08:00
David Anderson
b7062df8c0 Merge "fastboot: Fix "fastboot gsi"." 2019-01-31 18:06:58 +00:00
Martin Stjernholm
60b259b93a Make libnative*.so from the Runtime APEX libs accessible to vendor binaries.
Test: Flash and boot
Test: Boot test on internal tree
Bug: 119840313
Change-Id: I7c87519f94af2eeef9ebfd0d1e46e7bfca8df5c5
2019-01-31 17:03:16 +00:00
Martin Stjernholm
644c828e6b Merge "Enable APEX stubs for libnativeloader."
am: 6ad0b8f1b1

Change-Id: Iecc517c14661b65b6f526de0a2c9dbd1431f656d
2019-01-31 06:25:14 -08:00
Martin Stjernholm
6ad0b8f1b1 Merge "Enable APEX stubs for libnativeloader." 2019-01-31 14:14:52 +00:00
Pete Bentley
7b967bf6cf Export libjavacore into the conscrypt linker namespace.
Needed to allow access to AsynchronousCloseMonitor.

Bug: 123121395
Bug: 122881655
Test: atest CtsLibcoreOkHttpTestCases:com.squareup.okhttp.CallTest
Change-Id: I1c73a9beb7a083a61ed52e437d7377b2486a34f7
2019-01-31 11:06:41 +00:00
Josh Gao
12ac0c75ac Merge changes Ief3dbf8e,Ib06e6f65
am: ee0e63f71d

Change-Id: I9fa7bbac32f6156823a6a5aac7e0e401c584607e
2019-01-31 01:18:31 -08:00
Josh Gao
ee0e63f71d Merge changes Ief3dbf8e,Ib06e6f65
* changes:
  adb: add fdevent callback that passes the fdevent.
  base: don't overwrite errno in unique_fd::~unique_fd.
2019-01-31 09:09:12 +00:00
Bowgo Tsai
7ee1aaea74 Support getting public key data
This allows the client to get the public key data without need to
provide the expected key data to load vbmeta. Then do the comparison by
themselves, to allow "key rotation".

Bug: 65470881
Test: atest libfs_avb_test
Test: atest libfs_avb_internal_test
Test: boot a device
Change-Id: Icd4e317c2f79cd35e46cdd14f858575ee692facd
2019-01-31 16:49:33 +08:00
Jiyong Park
90b7095cf5 Merge changes from topic "move_bionic_to_apex3"
am: a15f385821

Change-Id: I85ee4d85f75bf77f487961b5194ec00c85296e33
2019-01-30 21:00:04 -08:00
Jiyong Park
43505e3f22 Proper mount namespace configuration for bionic
am: 6866041ff0

Change-Id: I2bcb6f2d3e855f1c8b7c3df36c8c3c1ca9e88a4e
2019-01-30 20:59:10 -08:00
Treehugger Robot
a15f385821 Merge changes from topic "move_bionic_to_apex3"
* changes:
  Handle adb sync with Bionic under /bionic
  Proper mount namespace configuration for bionic
2019-01-31 04:46:49 +00:00
Christopher Ferris
1783fa1940 Merge "Replace libbacktrace with libunwindstack directly."
am: 8926f1a945

Change-Id: Ic0934d94327f358cfb1f63c702f456098ba10677
2019-01-30 20:36:00 -08:00
Christopher Ferris
8926f1a945 Merge "Replace libbacktrace with libunwindstack directly." 2019-01-31 04:24:18 +00:00
Tom Cherry
a3530e6366 Add android::fs_mgr namespace for new Fstab code
Should have been done a while ago, but better late than never.

Test: treehugger
Change-Id: I0ea6e8d459cd3f3b3ce2d00a7a6a9786d52c52dd
2019-01-30 20:20:05 -08:00
Paul Lawrence
7cead3429e Merge "Improved libdm and dmctl to handle very large numbers of extents"
am: 083797adfd

Change-Id: I5dd3c352f63916d912fd6e46c2aafb7abf52e057
2019-01-30 18:05:35 -08:00
Bowgo Tsai
83e42a6d22 Merge "Enable AVB for dynamic GSI (f.k.a. Live Image)"
am: c1c624a132

Change-Id: I3c7a04947ccc7d60f163a2ef292f9f703495a193
2019-01-30 18:04:49 -08:00
Christopher Ferris
959013f3bd Merge "Avoid signed extension of chars for build ids."
am: d451f39245

Change-Id: Ia9145e164bc4e959c93618cd130b7337186a6e01
2019-01-30 18:01:07 -08:00
Treehugger Robot
083797adfd Merge "Improved libdm and dmctl to handle very large numbers of extents" 2019-01-31 02:00:32 +00:00
Bowgo Tsai
c1c624a132 Merge "Enable AVB for dynamic GSI (f.k.a. Live Image)" 2019-01-31 01:56:12 +00:00
Christopher Ferris
d451f39245 Merge "Avoid signed extension of chars for build ids." 2019-01-31 01:47:29 +00:00
Xiaoyong Zhou
0d2d068600 Merge "Add a tool to add keys to keyring."
am: ae7aaab94d

Change-Id: I3a8a215c960948d67646f48af2ed83251ab5a83d
2019-01-30 15:48:43 -08:00
Treehugger Robot
ae7aaab94d Merge "Add a tool to add keys to keyring." 2019-01-30 23:19:56 +00:00
Josh Gao
c162c713ef adb: add fdevent callback that passes the fdevent.
This is useful for when we don't want to actually store the fdevent
into a separate struct to be able to destroy it, but instead want to
destroy it immediately from the callback.

Test: adb_test
Change-Id: Ief3dbf8ea6a6bd72dc7e73f9ab9b7429e48fc181
2019-01-30 15:18:56 -08:00
Josh Gao
92ee52cc38 base: don't overwrite errno in unique_fd::~unique_fd.
unique_fd's destructor potentially mangling errno makes it difficult to
use correctly in code that sets errno (or, in reality, it makes it so
that errno values get randomly stomped upon if close actually sets
errno, because no one accounts for this case).

Preserve errno ourselves to avoid this.

Test: treehugger
Change-Id: Ib06e6f65866d86fff4032b2311021eaf9226a1af
2019-01-30 15:18:56 -08:00
Bowgo Tsai
ee6114fb1d Enable AVB for dynamic GSI (f.k.a. Live Image)
Bug: 117960205
Test: Use the dynamic Android to start GSI, checks verity is enabled.
Change-Id: I93b321808ba278b162fec5e231bff7229cac3937
2019-01-31 07:06:14 +08:00
Josh Gao
64e597a62f adb: improve network_connect error messages.
Test: manual
Change-Id: If8747ba1951d3c87561fbd3fb4968821243b2ee2
2019-01-30 14:54:10 -08:00
Josh Gao
eb0875db65 adbd: fix TCP bind address.
The switch to socket_spec_listen broke adbd over TCP, because
socket_spec_listen only listens on localhost.

Bug: http://b/123592649
Test: manual
Change-Id: Id1943ebd7f0059db05ad756fe96189c60ebde337
2019-01-30 14:49:20 -08:00
Dario Freni
f5a2df770b Merge "Fix: Propagate cmd args to multi-package sessions."
am: 2dc8b4cec8

Change-Id: Ib422b1dd4fa91971594af23d781ce2129cda6c39
2019-01-30 13:52:26 -08:00
Treehugger Robot
2dc8b4cec8 Merge "Fix: Propagate cmd args to multi-package sessions." 2019-01-30 21:42:25 +00:00
Paul Lawrence
605fef0e17 Improved libdm and dmctl to handle very large numbers of extents
Enables performance testing with very large numbers of dm-linear devices

Test: Can create device with 16384 extents, and can get its table
Bug: 123261135
Change-Id: I0e78a659eb7616e4db6a8276031e25a0d84f52ba
2019-01-30 13:29:41 -08:00
Xiaoyong Zhou
4a5c352e6d Add a tool to add keys to keyring.
This CL adds a binary to load keys to a keyring.

Bug: 112038861
Test: mini-keyctl -k .fsverity -c PATH_CONTAINER_CERTS
Test: cat /proc/keys and find the newly added keys
Change-Id: Iead68618ea194e9412616c5c6cff885e3cf78520
2019-01-30 13:08:31 -08:00
Christopher Ferris
ce34d62351 Avoid signed extension of chars for build ids.
Added a unit test that fails before the change and passes afterwards.

Bug: 120606663

Test: All unit tests pass.
Change-Id: I054c7eac0c55abc3babe1d48a041f5819ad9db81
2019-01-30 12:09:11 -08:00
Erick Reyes
0001c50d8e Merge "meminfo: handle multiple buffer references in dmabufinfo"
am: 627a37cad9

Change-Id: I84dc681ee7eaeaea05b72853c4b072139b427d8e
2019-01-30 11:28:13 -08:00
Treehugger Robot
627a37cad9 Merge "meminfo: handle multiple buffer references in dmabufinfo" 2019-01-30 19:11:20 +00:00
David Anderson
f258278929 Merge "libfiemap_writer: Remove Flush and Write methods."
am: 98910920ba

Change-Id: Ie7b062606994032f49f534eeebe4813747aed5ea
2019-01-30 09:41:25 -08:00
David Anderson
520aa5bfa1 Merge "Add user/group for gsid."
am: 9747a65380

Change-Id: Ia3d0ddb8997e8c4739cb33c709bb9606e2a518dd
2019-01-30 09:34:17 -08:00