Commit graph

48029 commits

Author SHA1 Message Date
Jesse Hall
5a470dbbf9 Merge "Search/permit /vendor/${LIB}/hw in sphal namespace" am: afc2ac106a am: e9e72c0a04
am: a63b03a3c2

Change-Id: I33021f16c204e282a0a3294b568a17196ea737f8
2019-01-31 22:09:16 -08:00
Jesse Hall
a63b03a3c2 Merge "Search/permit /vendor/${LIB}/hw in sphal namespace" am: afc2ac106a
am: e9e72c0a04

Change-Id: Icadbd8b97f4dd194bfbf0acf3d42c52e993b5e7f
2019-01-31 22:04:02 -08:00
Jesse Hall
e9e72c0a04 Merge "Search/permit /vendor/${LIB}/hw in sphal namespace"
am: afc2ac106a

Change-Id: I527eb664d108a004d90e80ef48e8f8b0ac25d97a
2019-01-31 21:56:53 -08:00
Treehugger Robot
afc2ac106a Merge "Search/permit /vendor/${LIB}/hw in sphal namespace" 2019-02-01 05:50:49 +00:00
Xiaoyong Zhou
fdcffccc23 Merge "install mini-keyctl to /system/bin" am: 055b549497 am: 8307c34ed7
am: 189d7b68ec

Change-Id: I1d0b52cd2d317b7d88ec8cc895f0bc553f1a9587
2019-01-31 20:15:36 -08:00
Xiaoyong Zhou
189d7b68ec Merge "install mini-keyctl to /system/bin" am: 055b549497
am: 8307c34ed7

Change-Id: I6b677554b1f4ab184531e16049b080fe1b97aa57
2019-01-31 20:06:53 -08:00
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
Jesse Hall
bdebda2bba Search/permit /vendor/${LIB}/hw in sphal namespace
The vulkan runtime loads drivers into the sphal namespace and relies
on them being in the sphal search path so that it doesn't have to
hardcode /vendor/${LIB}/hw.

These paths used to be allowed, but were removed by commit 2498e1b
because they were believed not to be required. Things didn't break
immediately because the vulkan runtime has a (supposed to be
temporary) fallback to hw_get_module, which loads from
/vendor/${LIB}/hw using absolute paths.

Bug: 123600276
Test: Launch Vulkan app on device with hw_get_module disabled
Change-Id: I07ac43bc9d2d877d8f427058b2d62c62d065c558
2019-01-31 18:13:03 -08:00
Bowgo Tsai
99f3c26294 Merge "Support getting public key data" am: 66e76443a0 am: b20bf7566c
am: 9bc843973b

Change-Id: I19358df3283e604a8ae9805b02b726545375b409
2019-01-31 16:07:19 -08:00
Bowgo Tsai
9bc843973b Merge "Support getting public key data" am: 66e76443a0
am: b20bf7566c

Change-Id: I9a3d80f111301445925a550f224d8fa0f843a9fb
2019-01-31 15:50:56 -08: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
Josh Gao
41b2e6f282 Merge changes If8747ba1,Id1943ebd am: 69ba5179f4 am: a2e6417840
am: b890b1acd2

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

Change-Id: Ia6ec7ce93391b0f63fe64ecae95bbadaf2b027d2
2019-01-31 13:51:23 -08: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
b890b1acd2 Merge changes If8747ba1,Id1943ebd am: 69ba5179f4
am: a2e6417840

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

Change-Id: I0fdb0ecbeef89695ab18ffc341150842064bc228
2019-01-31 13:34:49 -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
5f174d3649 Merge "Add android::fs_mgr namespace for new Fstab code" am: 54ea49ba05 am: 0bc62d5680
am: 0dec9106c3

Change-Id: I7fd5d3927dde907a7dbf8ad47325c3a9c5819d0d
2019-01-31 12:23:54 -08:00
Tom Cherry
0dec9106c3 Merge "Add android::fs_mgr namespace for new Fstab code" am: 54ea49ba05
am: 0bc62d5680

Change-Id: Ice435221d6cbf1a08b781062abe16968446ba643
2019-01-31 12:06:33 -08: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
Pete Bentley
a358fbe73e Merge "Export libjavacore into the conscrypt linker namespace." am: 43c17b0c03 am: e29eba6ce1
am: a47bd41419

Change-Id: Ic6c52c442e379232d20f57dfc6eb45c658b4cd06
2019-01-31 11:47:49 -08:00
Pete Bentley
a47bd41419 Merge "Export libjavacore into the conscrypt linker namespace." am: 43c17b0c03
am: e29eba6ce1

Change-Id: Ifb12717a76d31548fc55883e09a0b74782e6653e
2019-01-31 11:39:12 -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
f645c85b2d Merge "fastboot: Fix "fastboot gsi"." am: b7062df8c0 am: 75e9ef5252
am: a43a4eecff

Change-Id: Id8cf7e44fdcc59fff656a9fe9a5e7ff9c9d4466f
2019-01-31 10:29:15 -08:00
David Anderson
a43a4eecff Merge "fastboot: Fix "fastboot gsi"." am: b7062df8c0
am: 75e9ef5252

Change-Id: I536f55c07406084e4311fe9ede4ae6c1511fe04c
2019-01-31 10:23:58 -08: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
1f5673a3bb Merge "Enable APEX stubs for libnativeloader." am: 6ad0b8f1b1 am: 644c828e6b
am: 90dce3c3c0

Change-Id: I6413aef9035024be68ad17df860a6940c33e7644
2019-01-31 06:34:02 -08:00
Martin Stjernholm
90dce3c3c0 Merge "Enable APEX stubs for libnativeloader." am: 6ad0b8f1b1
am: 644c828e6b

Change-Id: Ic718578654c2caf0185c7d46747f9fefca2c1692
2019-01-31 06:29:39 -08: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
4a7704cd76 Merge changes Ief3dbf8e,Ib06e6f65 am: ee0e63f71d am: 12ac0c75ac
am: f4a35a0ec6

Change-Id: I74478f32beb3cc5014f90740f3a8838f67b7cd6b
2019-01-31 01:29:29 -08:00
Josh Gao
f4a35a0ec6 Merge changes Ief3dbf8e,Ib06e6f65 am: ee0e63f71d
am: 12ac0c75ac

Change-Id: I52acef692341381cf8e0f6e07e9f0b2fd9535d63
2019-01-31 01:24:22 -08: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
7b9a913497 Merge changes from topic "move_bionic_to_apex3" am: a15f385821 am: 90b7095cf5
am: 7ce93d2d0d

Change-Id: I670493883a18e604bb3cbc80979c76d0a725c0ef
2019-01-30 21:30:28 -08:00
Jiyong Park
06a982691c Proper mount namespace configuration for bionic am: 6866041ff0 am: 43505e3f22
am: 9829a8c5aa

Change-Id: I624273bf06ad96dfee5def80dc16050c52a7a640
2019-01-30 21:29:34 -08:00
Jiyong Park
7ce93d2d0d Merge changes from topic "move_bionic_to_apex3" am: a15f385821
am: 90b7095cf5

Change-Id: I991844dca444abbf4ad3c589976a516d951f66c0
2019-01-30 21:13:21 -08:00
Jiyong Park
9829a8c5aa Proper mount namespace configuration for bionic am: 6866041ff0
am: 43505e3f22

Change-Id: Ia29bf355c839bc9f8d5b8f1b6210a147c2fe6ccf
2019-01-30 21:12:38 -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