Commit graph

63224 commits

Author SHA1 Message Date
Treehugger Robot
aedb8fdd35 Merge "init: failed to set sys.usb.controller" am: 7c1c167307 am: e22844007e am: 11fc5ee64d am: 1ec5cffd71
Change-Id: I2a85ebecab1ffec96a4735ff8bf261e3a0deea21
2020-05-14 19:58:28 +00:00
Treehugger Robot
1ec5cffd71 Merge "init: failed to set sys.usb.controller" am: 7c1c167307 am: e22844007e am: 11fc5ee64d
Change-Id: Ie11d72a6c27a8c5f509fb36adc44ec67b4d8e0d6
2020-05-14 19:44:58 +00:00
Treehugger Robot
11fc5ee64d Merge "init: failed to set sys.usb.controller" am: 7c1c167307 am: e22844007e
Change-Id: I94e371f15e3553480b78be15ef70c237583d722b
2020-05-14 19:31:34 +00:00
Treehugger Robot
e22844007e Merge "init: failed to set sys.usb.controller" am: 7c1c167307
Change-Id: Ic07e38c5bd3dac7404ec4ae742dcafb15c835769
2020-05-14 19:17:17 +00:00
Treehugger Robot
7c1c167307 Merge "init: failed to set sys.usb.controller" 2020-05-14 18:57:31 +00:00
Christopher Ferris
e83afafb8e Merge "Add new LocalUpdatableMaps benchmarks." am: 5133bbfd34 am: d6831f57e5 am: 26e8575b31 am: 9913d65cd7
Change-Id: Iacb38cdca7d6e4b6b51c7c3ade8d1c86a3beb116
2020-05-14 02:01:29 +00:00
Christopher Ferris
9913d65cd7 Merge "Add new LocalUpdatableMaps benchmarks." am: 5133bbfd34 am: d6831f57e5 am: 26e8575b31
Change-Id: Ica0d8e805e9bb702329bde4c122e97b2df5ca21e
2020-05-14 01:43:15 +00:00
Christopher Ferris
26e8575b31 Merge "Add new LocalUpdatableMaps benchmarks." am: 5133bbfd34 am: d6831f57e5
Change-Id: I4c0aaa43dc2831f47531cb23d4683f40e2e810ed
2020-05-14 01:29:41 +00:00
Mark Salyzyn
150687b87d init: failed to set sys.usb.controller
With GKI we find in certain situations the timing of the drivers
loading is delayed as compared to a monolithic kernel.  This
introduces a race where during second stage init, the attributes
inside /sys/class/udc/ might not be set by the time
SetUsbController() is called.

To address this, we also call SetUsbController() until the property
sys.usb.controller is set at the bottom of the event loop.

Signed-off-by: Mark Salyzyn <salyzyn@google.com>
Bug: 151950334
Test: make sure user space fastbootd comes up reliably for a GKI kernel
Change-Id: Iececd8ffa3e6641554d215d622d8dab72d85d34d
2020-05-13 17:56:31 -07:00
Christopher Ferris
d6831f57e5 Merge "Add new LocalUpdatableMaps benchmarks." am: 5133bbfd34
Change-Id: I712f9c4ce5cfd0f4693e9645f1a9f935f11725ea
2020-05-14 00:41:39 +00:00
Christopher Ferris
5133bbfd34 Merge "Add new LocalUpdatableMaps benchmarks." 2020-05-14 00:18:27 +00:00
Tom Cherry
f95b17448c Merge "logd: enable LTO" am: 17e8605bcf am: 01ae2552ea am: 5e09d0722e am: 6f039d13c1
Change-Id: I2199f22b508dd98f427a2aeb598d2dcd15b34aed
2020-05-13 21:50:50 +00:00
Tom Cherry
6f039d13c1 Merge "logd: enable LTO" am: 17e8605bcf am: 01ae2552ea am: 5e09d0722e
Change-Id: Ib5a67fe6885f91d01e656ff634ab57bcb578ceeb
2020-05-13 21:30:08 +00:00
Nikita Ioffe
74be09b5fb [automerger skipped] Merge "Make /data/apex/active world readable" am: ae6cab0406 am: 0936da291c -s ours am: 53b5b3a7f5 -s ours am: 6591403691 -s ours
am skip reason: Change-Id I5278897413ca0e32aed9d1c7f82e48138bc51404 with SHA-1 71278019d1 is in history

Change-Id: Ibedd5048e9711142db6c8601c57b810313780a8d
2020-05-13 21:22:22 +00:00
Tom Cherry
5e09d0722e Merge "logd: enable LTO" am: 17e8605bcf am: 01ae2552ea
Change-Id: I240b2aaa0a013a7bf99c5c388c34cd734669700c
2020-05-13 21:16:44 +00:00
Nikita Ioffe
6591403691 [automerger skipped] Merge "Make /data/apex/active world readable" am: ae6cab0406 am: 0936da291c -s ours am: 53b5b3a7f5 -s ours
am skip reason: Change-Id I5278897413ca0e32aed9d1c7f82e48138bc51404 with SHA-1 71278019d1 is in history

Change-Id: I3a930ecc52d482ce4b744649a177c4bea4a72f9e
2020-05-13 21:04:05 +00:00
Tom Cherry
01ae2552ea Merge "logd: enable LTO" am: 17e8605bcf
Change-Id: Iec29c3588b0dffe1973bd2841ae8724dc95b866b
2020-05-13 21:03:48 +00:00
Tom Cherry
17e8605bcf Merge "logd: enable LTO" 2020-05-13 20:51:57 +00:00
Nikita Ioffe
53b5b3a7f5 [automerger skipped] Merge "Make /data/apex/active world readable" am: ae6cab0406 am: 0936da291c -s ours
am skip reason: Change-Id I5278897413ca0e32aed9d1c7f82e48138bc51404 with SHA-1 71278019d1 is in history

Change-Id: I21b36ed68c9659215b3aaf8c2010ab28518aeb6a
2020-05-13 20:45:22 +00:00
Treehugger Robot
577e04abb1 Merge "fastbootd: copy AVB footer on boot image to end of block device" am: 37f45fcd3b am: 8ca3b7a553 am: ff90461417 am: 59d10a7d80
Change-Id: Ib11cdaf74feb24e6e9b3d810dccd6467c17560c8
2020-05-13 20:39:27 +00:00
Nikita Ioffe
0936da291c Merge "Make /data/apex/active world readable" am: ae6cab0406
Change-Id: I52ddb243530a894ebcf3cdceb47dd6a475158ff6
2020-05-13 20:32:25 +00:00
Treehugger Robot
59d10a7d80 Merge "fastbootd: copy AVB footer on boot image to end of block device" am: 37f45fcd3b am: 8ca3b7a553 am: ff90461417
Change-Id: I7e6712846f8b47252dfc91ca6254d51e29228eab
2020-05-13 20:25:28 +00:00
Nikita Ioffe
ae6cab0406 Merge "Make /data/apex/active world readable" 2020-05-13 20:15:12 +00:00
Treehugger Robot
ff90461417 Merge "fastbootd: copy AVB footer on boot image to end of block device" am: 37f45fcd3b am: 8ca3b7a553
Change-Id: Ie80a2ce7a298c7da8f9acc8c18cc7340e82ff584
2020-05-13 20:02:54 +00:00
Treehugger Robot
8ca3b7a553 Merge "fastbootd: copy AVB footer on boot image to end of block device" am: 37f45fcd3b
Change-Id: Ifdfb3952d557f8c836eb39c960ae879ec94a76ce
2020-05-13 19:47:10 +00:00
Treehugger Robot
37f45fcd3b Merge "fastbootd: copy AVB footer on boot image to end of block device" 2020-05-13 19:38:03 +00:00
Tom Cherry
72f1aa8bf2 logd: enable LTO
Logd is self contained so LTO should be net beneficial.

Bug: 155322981
Test: logging unit tests
Change-Id: I7e26fcf15a7886ed537685d921428c679d7390f8
2020-05-13 11:04:02 -07:00
Tom Cherry
1ff1ea61b9 Merge changes I5731d640,Ia874b57a am: 0b3f9567c5 am: 1dc6605a44 am: dd2830dc9e am: c4473ba5b6
Change-Id: I712252ee2a3d1c05b20ccf0b93019bacfa821daf
2020-05-13 17:21:06 +00:00
Tom Cherry
c4473ba5b6 Merge changes I5731d640,Ia874b57a am: 0b3f9567c5 am: 1dc6605a44 am: dd2830dc9e
Change-Id: I8991d4d75c08dd162e0548e6d8a142eebd1b4f92
2020-05-13 17:07:33 +00:00
Tom Cherry
dd2830dc9e Merge changes I5731d640,Ia874b57a am: 0b3f9567c5 am: 1dc6605a44
Change-Id: I9b8833d42b495aafe33bc0905a08d01c4196b690
2020-05-13 16:53:38 +00:00
Tom Cherry
1dc6605a44 Merge changes I5731d640,Ia874b57a am: 0b3f9567c5
Change-Id: I6c8da8d8edf28440d8c6a4f737978e3757518b5c
2020-05-13 16:23:43 +00:00
Tom Cherry
0b3f9567c5 Merge changes I5731d640,Ia874b57a
* changes:
  logd: make LogBuffer an interface
  logd: refactor LastLogTimes a bit
2020-05-13 16:08:44 +00:00
Jooyung Han
b9f0f80277 [automerger skipped] Set min_sdk_version to be part of mainline modules am: 7937f29be8 am: ebce9ac166 am: 2c7743e930 -s ours
am skip reason: Change-Id Ida890adfe6dfac79267fc0e18b63d2330266438c with SHA-1 7937f29be8 is in history

Change-Id: I3ab4aac10bdc4e7f7d188b150b1a0ca9d48de1be
2020-05-13 08:07:13 +00:00
Jooyung Han
b856ae4ece [automerger skipped] Set min_sdk_version to be part of mainline modules am: 7937f29be8 -s ours am: d8ea6b40cd -s ours am: db9e6d2df2 -s ours
am skip reason: Change-Id Ida890adfe6dfac79267fc0e18b63d2330266438c with SHA-1 7937f29be8 is in history

Change-Id: I794579abd04b3ac661352cd1ea0b536e09deba09
2020-05-13 08:07:00 +00:00
Jooyung Han
da09c33e94 [automerger skipped] Set min_sdk_version to be part of mainline modules am: 7937f29be8 am: ebce9ac166 -s ours am: a827b3a2e4 -s ours
am skip reason: Change-Id Ida890adfe6dfac79267fc0e18b63d2330266438c with SHA-1 7ea0d74bc8 is in history

Change-Id: Ie52b3fc95786a2195c312a89dec98baadfdabd92
2020-05-13 08:06:54 +00:00
Jooyung Han
db9e6d2df2 [automerger skipped] Set min_sdk_version to be part of mainline modules am: 7937f29be8 -s ours am: d8ea6b40cd -s ours
am skip reason: Change-Id Ida890adfe6dfac79267fc0e18b63d2330266438c with SHA-1 7937f29be8 is in history

Change-Id: I4f912b40bdf6940648bccf02d07b35228abca9c3
2020-05-13 07:54:18 +00:00
Jooyung Han
2c7743e930 Set min_sdk_version to be part of mainline modules am: 7937f29be8 am: ebce9ac166
Change-Id: Ib4d1065cbb7453cfc14daa70ff91814524bc386c
2020-05-13 07:54:07 +00:00
Jooyung Han
a827b3a2e4 [automerger skipped] Set min_sdk_version to be part of mainline modules am: 7937f29be8 am: ebce9ac166 -s ours
am skip reason: Change-Id Ida890adfe6dfac79267fc0e18b63d2330266438c with SHA-1 7ea0d74bc8 is in history

Change-Id: I1e57c57c94fb56c7471432fc98b614b7664008b0
2020-05-13 07:54:07 +00:00
Jooyung Han
d8ea6b40cd [automerger skipped] Set min_sdk_version to be part of mainline modules am: 7937f29be8 -s ours
am skip reason: Change-Id Ida890adfe6dfac79267fc0e18b63d2330266438c with SHA-1 7ea0d74bc8 is in history

Change-Id: I910fd7781b85f006b5c4f2087713a31844dfba47
2020-05-13 07:35:36 +00:00
Jooyung Han
ebce9ac166 Set min_sdk_version to be part of mainline modules am: 7937f29be8
Change-Id: I072e434e1893512e433cf1bbf83804a8a210f31e
2020-05-13 07:35:23 +00:00
Treehugger Robot
01787112bf Merge "Make some fdevent member functions pure virtual." am: b6a6023bda am: dce1b6ebfa am: 1c4902d3bf am: 8bb0bba974
Change-Id: I86581b41b133d4d336f6de4ad13fe93e92423e73
2020-05-13 04:46:52 +00:00
Treehugger Robot
8bb0bba974 Merge "Make some fdevent member functions pure virtual." am: b6a6023bda am: dce1b6ebfa am: 1c4902d3bf
Change-Id: Ibc4b23dee10501c3f0997a6db285e1968fc4fa05
2020-05-13 04:28:20 +00:00
Treehugger Robot
1c4902d3bf Merge "Make some fdevent member functions pure virtual." am: b6a6023bda am: dce1b6ebfa
Change-Id: I84a95074c03d28a487571168b7ad144eb9e65221
2020-05-13 04:09:51 +00:00
Treehugger Robot
dce1b6ebfa Merge "Make some fdevent member functions pure virtual." am: b6a6023bda
Change-Id: I004aea068c5f36f0033d6633ca33122c1a09c7a2
2020-05-13 03:47:04 +00:00
Treehugger Robot
b6a6023bda Merge "Make some fdevent member functions pure virtual." 2020-05-13 03:31:03 +00:00
Jooyung Han
7937f29be8 Set min_sdk_version to be part of mainline modules
Modules contributing mainline modules (APK/APEX) should set
min_sdk_version as well as apex_available.

For now setting min_sdk_version doesn't change build outputs.
But build-time checks will be added soon.

Bug: 152655956
Test: m
Merged-In: Ida890adfe6dfac79267fc0e18b63d2330266438c
Change-Id: Ida890adfe6dfac79267fc0e18b63d2330266438c
(cherry picked from commit 7ea0d74bc8)
2020-05-13 12:10:36 +09:00
Jooyung Han
97e3a39818 Merge "Set min_sdk_version to be part of mainline modules" am: 63d363baea am: b7b6f92c21 am: d6e8d0b68b am: 3328411adb
Change-Id: I921f96734bca298fb670b38ff92083a9627fe511
2020-05-13 01:57:58 +00:00
Treehugger Robot
9cc53cc8bd Merge "Add a few more trivial socket_spec.h tests." am: 53053dd1b1 am: 81c0b12c50 am: dfbc5d3853 am: c390ad9d3e
Change-Id: I0c85800f972449bf546e55043be5f31cbc7db197
2020-05-13 01:56:53 +00:00
Jooyung Han
3328411adb Merge "Set min_sdk_version to be part of mainline modules" am: 63d363baea am: b7b6f92c21 am: d6e8d0b68b
Change-Id: I5b123c0545d545875f0cc8f8e10976343c37e40e
2020-05-13 01:41:41 +00:00
Treehugger Robot
c390ad9d3e Merge "Add a few more trivial socket_spec.h tests." am: 53053dd1b1 am: 81c0b12c50 am: dfbc5d3853
Change-Id: Ie9a040101403bde7defd653fc38dfbe699227b44
2020-05-13 01:41:22 +00:00