Commit graph

59622 commits

Author SHA1 Message Date
TreeHugger Robot
9113e7be95 Merge changes I2fcd093e,I24210426 into rvc-dev
* changes:
  Optimizing install-multi-package to use ABB.
  Incremental install mode for install-multi.
2020-05-19 20:12:04 +00:00
Hongguang Chen
7516ebe63b fastbootd: Support TCP protocol.
The current fastbootd only supports USB protocol. But some Android TV
devices are built without USB port. The fastbootd cannot be used on
those ATV devices due to it.
This change adds TCP protocol for such devices and fastbootd.protocol
property is added to control which protocol to use.

BUG: 152544169
BUG: 155198345
Test: manual test.
Change-Id: Idc391e677eb6a1880036419ba5f6c4160e8dbcbc
Merged-In: Idc391e677eb6a1880036419ba5f6c4160e8dbcbc
2020-05-19 19:11:25 +00:00
David Anderson
42d676db47 libsnapshot_test: Fix running on DSUs.
Because DSUs mount userdata via a fiemap, libfiemap has trouble creating
additional fiemaps on top of it. The complex stacking of dm-linear is
not supported. For other libfiemap tests we've hacked around this
limitation. If LpMetadata is in a folder named "test", we allow the
backing device search to stop at a dm node, whereas otherwise it would
need to stop at a physical device.

However this was not quite enough for vts_libsnapshot_test, because (1)
the test folder was not included in the pattern match, and (2)
CreateLogicalPartition() could not handle device-mapper names, as it
expects a named physical partition. Addressing both of these allows the
tests to pass on DSUs.

Bug: 156713441
Test: vts_libsnapshot_test on DSU
Change-Id: Ie7ee70e31dff0809a5f0c402ed132d80dd03d9b1
Merged-In: Ie7ee70e31dff0809a5f0c402ed132d80dd03d9b1
2020-05-19 18:48:10 +00:00
TreeHugger Robot
129bef9c26 Merge "init: failed to set sys.usb.controller" into rvc-dev am: 5b07f4f322
Change-Id: I9817c2239b059747b7946f27d7f8b049313457ab
2020-05-19 14:01:40 +00:00
TreeHugger Robot
5b07f4f322 Merge "init: failed to set sys.usb.controller" into rvc-dev 2020-05-19 13:48:39 +00:00
android-build-team Robot
1f03b4ac82 Snap for 6508895 from 802417697f to mainline-release
Change-Id: If6f4c7889689342207c09b42ac78b25d2e13fd05
2020-05-19 07:03:40 +00:00
Steve Muckle
462912a84c add API to get hash descriptor am: b510d2bff3
Change-Id: I2c4efdaffa5dec1804330e30912b9145b8e0bd89
2020-05-19 05:22:22 +00:00
Alex Buynytskyy
61f4ab89a2 Optimizing install-multi-package to use ABB.
Bug: 150803885
Test: atest adb_test adbd_test
Test: adb install-multi-package Picsart_9.30.5.apk Pinterest_6.54.0.apk
Change-Id: I2fcd093e61afdd16d481194e1d5f8f66acf6a66c
Merged-In: I2fcd093e61afdd16d481194e1d5f8f66acf6a66c
2020-05-19 04:26:42 +00:00
Alex Buynytskyy
f1e187be01 Incremental install mode for install-multi.
Bug: 150803885
Test: atest adb_test adbd_test fastdeploy_test
Change-Id: I242104267273bac21ab41390d3e77a434ffa565d
Merged-In: I242104267273bac21ab41390d3e77a434ffa565d
2020-05-18 21:26:10 -07:00
Steve Muckle
b510d2bff3 add API to get hash descriptor
The GKI verification VTS test will need to examine the boot partition's
hash descriptor, so add support to access this descriptor.

Bug: 148800209
Test: atest AvbTest#Boot
Change-Id: I92e32f61a265671ae0940c44147391f73776e66a
Merged-In: I92e32f61a265671ae0940c44147391f73776e66a
2020-05-18 12:38:18 -07:00
android-build-team Robot
775fe09054 Snap for 6504394 from 59e0da7287 to mainline-release
Change-Id: I2f2e19bcdf72123022fcddf056f249cfd4547c9d
2020-05-18 07:00:56 +00:00
Jooyung Han
802417697f Merge "backtrace: Set min_sdk_version" into rvc-dev am: 8de46ae39d
Change-Id: I5d28cc28fdde08b4f5f8a1a7c98aeb6c01ccda4a
2020-05-18 06:49:49 +00:00
Jooyung Han
8de46ae39d Merge "backtrace: Set min_sdk_version" into rvc-dev 2020-05-18 06:34:01 +00:00
Jooyung Han
148f7b32d7 backtrace: Set min_sdk_version
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.

Exempt-From-Owner-Approval: cherry-pick from AOSP

Bug: 152655956
Test: m
Merged-In: I9ff06ca47c8bc2cc5632ffb3494e4fb8eb79d5a3
Change-Id: I9ff06ca47c8bc2cc5632ffb3494e4fb8eb79d5a3
(cherry picked from commit bc62a19448)
2020-05-18 06:33:37 +00:00
TreeHugger Robot
59e0da7287 Merge "fastbootd: copy AVB footer on boot image to end of block device" into rvc-dev am: 56c1c590ac
Change-Id: Ieff1bf5a5285bd32185c30d3fe6290af7fcfd7ee
2020-05-18 04:43:29 +00:00
TreeHugger Robot
2d91a2fc76 Merge "Set apex_available property" into rvc-dev am: c6c000d1a5
Change-Id: I5cd5cb2e3e9a926bf332f20e396724c8155c3c6f
2020-05-18 04:43:16 +00:00
TreeHugger Robot
56c1c590ac Merge "fastbootd: copy AVB footer on boot image to end of block device" into rvc-dev 2020-05-18 04:37:37 +00:00
TreeHugger Robot
c6c000d1a5 Merge "Set apex_available property" into rvc-dev 2020-05-18 04:24:55 +00:00
Steve Muckle
bd98e25439 fastbootd: copy AVB footer on boot image to end of block device
If the flashed boot image is smaller than the block device, the AVB
footer will not be at the end of the partition. Although images are
normally created to match the partition size the GKI boot.img must work
on all devices, and the size of the boot partition will vary.

Copy the AVB footer to the end of the partition before flashing, if it
is not there already.

Bug: 156036850
Change-Id: I11f0c7d32d1b6c74edd4f84f815d175605280cb8
Merged-In: I11f0c7d32d1b6c74edd4f84f815d175605280cb8
2020-05-17 17:01:25 -07:00
android-build-team Robot
e877b3cdd6 Snap for 6502793 from 02a2e222a9 to mainline-release
Change-Id: I9d151d8f9c727dc2f66796b4d5f3f9fcdc82d1de
2020-05-17 07:01:05 +00:00
Alex Buynytskyy
02a2e222a9 Passing additional flags to incremental installation. am: 74e9e3c27a
Change-Id: Ibe4d37f8dff44cf81024069d8be5909d0cb56d02
2020-05-16 00:52:42 +00:00
Alex Buynytskyy
74e9e3c27a Passing additional flags to incremental installation.
Bug: 150803885
Test: atest adb_test adbd_test fastdeploy_test
Change-Id: Ifa9b9e570259d35eb0121817bbb791044c6efcfd
Merged-In: Ifa9b9e570259d35eb0121817bbb791044c6efcfd
2020-05-14 21:00:10 +00:00
Mark Salyzyn
6fca594fc2 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-14 13:05:42 -07:00
android-build-team Robot
eced8fe7fc Snap for 6492189 from 78bd6ed3b2 to mainline-release
Change-Id: I57148b838f08fa22769abde2961e888ddc88d4e9
2020-05-13 22:47:25 +00:00
Jooyung Han
78bd6ed3b2 Set min_sdk_version to be part of mainline modules am: 7937f29be8
Change-Id: I319df7e892fd9895bab14c3a10e5d5b686f197eb
2020-05-13 07:35:42 +00:00
android-build-team Robot
93b31fde4e Snap for 6489494 from 853c61291e to mainline-release
Change-Id: Ieff57cbd9992ee2a142fd445930cc9b61a3a2a9f
2020-05-13 07:00:38 +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
Christopher Ferris
853c61291e Merge "Fix mac build." into rvc-dev am: 310b46c1ca
Change-Id: Iec6a046c5f66c6fc7d7bba196be2ae9523536ddc
2020-05-12 17:40:07 +00:00
Christopher Ferris
2b649da9fa Merge "Change call to mmap64." into rvc-dev am: 99dfe5ebba
Change-Id: Ib33f8da43db5460266bf53a5a7a0f8e01738d370
2020-05-12 17:40:04 +00:00
Christopher Ferris
310b46c1ca Merge "Fix mac build." into rvc-dev 2020-05-12 17:17:25 +00:00
Christopher Ferris
99dfe5ebba Merge "Change call to mmap64." into rvc-dev 2020-05-12 17:17:25 +00:00
TreeHugger Robot
1e0f79e47e Merge changes Idaa27ce2,I06644a72,I453c63fe into rvc-dev am: 7499783fd9
Change-Id: I52808cfad7f3b2f9d5e525574022cc1a82d0aa72
2020-05-12 09:16:50 +00:00
Jooyung Han
b9ca8900a9 gralloc: Set min_sdk_version am: 3c20c62cdd
Change-Id: I8c35b6cef3606ff4442550fce65487eb905d57d9
2020-05-12 09:16:47 +00:00
Jooyung Han
404a780d17 libcutils: Set min_sdk_version am: 86455d7f87
Change-Id: I812de6b7801759c6d4d74165963fdb93990142cf
2020-05-12 09:16:46 +00:00
TreeHugger Robot
7499783fd9 Merge changes Idaa27ce2,I06644a72,I453c63fe into rvc-dev
* changes:
  processgroup: Set min_sdk_version
  gralloc: Set min_sdk_version
  libcutils: Set min_sdk_version
2020-05-12 09:00:50 +00:00
android-build-team Robot
06760075e1 Snap for 6485046 from 3b1f59ce50 to mainline-release
Change-Id: Ibf2f6f313f9f290b284187fca5ce0d8d28e9fb36
2020-05-12 07:05:08 +00:00
Maciej Zenczykowski
3b1f59ce50 Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev am: ce7d0ba607
Change-Id: I6d739a1dd5e7c692abe97184f32e54ebba6e10f3
2020-05-12 02:10:59 +00:00
Maciej Żenczykowski
9c36e5d1ea libnetutils/packet.c - fix a raw socket reception race am: 74346aac9c
Change-Id: Ie58559a137aca77b4ded206d1518e898e46f1f8f
2020-05-12 02:10:57 +00:00
Maciej Żenczykowski
f97d2bf276 libnetutils/packet.c - fix a socket leak on bind error am: b9add4a315
Change-Id: Ic5a571fe64582a696679f2a4b7f9aa3a5f5a21ca
2020-05-12 02:10:55 +00:00
Maciej Zenczykowski
ce7d0ba607 Merge changes I57cb2003,I569d2b81,I01a10e36 into rvc-dev
* changes:
  libnetutils/packet.c - create socket with close-on-exec
  libnetutils/packet.c - fix a raw socket reception race
  libnetutils/packet.c - fix a socket leak on bind error
2020-05-12 01:57:56 +00:00
TreeHugger Robot
e825277a98 Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev am: 8601d37213
Change-Id: I3e25335c4c1b657a2400f6878d0200955e6422c5
2020-05-12 00:49:38 +00:00
TreeHugger Robot
8601d37213 Merge "libsnapshot: fix incorrect assumption of cow images" into rvc-dev 2020-05-12 00:32:22 +00:00
TreeHugger Robot
7925cae7f9 Merge "vts_processgroup_validate_test: make deps static" into rvc-dev am: f2caf7de6c
Change-Id: I1b94e1bf51279ea209f747cbdef039874266f022
2020-05-11 23:48:13 +00:00
TreeHugger Robot
f2caf7de6c Merge "vts_processgroup_validate_test: make deps static" into rvc-dev 2020-05-11 23:33:28 +00:00
Christopher Ferris
1500d0e7a9 Fix mac build.
Add an inline for mmap64 to use on mac.

Bug: 155662887
Bug: 156053599

Test: Builds.
Change-Id: Id02e2c2f40acea2bdef604e9b80b70a85a941927
(cherry picked from commit 8a6dff22dc)
2020-05-11 23:07:53 +00:00
Maciej Żenczykowski
ecfb05d4ce libnetutils/packet.c - create socket with close-on-exec
This prevents fork/exec leaking sockets to child processes.

Test: builds, atest
Bug: 155297277
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I57cb2003dd75b0bc5528978fd131730273e37a43
Merged-In: I57cb2003dd75b0bc5528978fd131730273e37a43
2020-05-11 15:58:02 -07:00
Maciej Żenczykowski
74346aac9c libnetutils/packet.c - fix a raw socket reception race
A socket created bound to a specific protocol can receive packets before
it's bound to a specific interface/mac.

It's best to rely on the bind().

This replicates the way packet sockets are created in external/android-clat.
See: ring.c ring_create() and clatd.c configure_packet_socket()

Test: builds, atest
Bug: 155297277
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I569d2b81a396f352ab5d1b71bd5ad0d96217aab1
Merged-In: I569d2b81a396f352ab5d1b71bd5ad0d96217aab1
2020-05-11 15:57:53 -07:00
Maciej Żenczykowski
b9add4a315 libnetutils/packet.c - fix a socket leak on bind error
and clean up the code a little bit while at it.

Test: builds, atest
Bug: 155297277
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I01a10e36f852cde1b93a91f95b51294a434885ab
Merged-In: I01a10e36f852cde1b93a91f95b51294a434885ab
2020-05-11 15:57:44 -07:00
Yifan Hong
01840c53e8 vts_processgroup_validate_test: make deps static
Test: pass
Fixes: 155959743
Change-Id: I730526955a40ae00a97f487e423a00c743f75d53
(cherry picked from commit 2572f23af8)
Merged-In: I730526955a40ae00a97f487e423a00c743f75d53
2020-05-11 12:32:26 -07:00
Ruchir Rastogi
c7de5847f1 Merge "Use proper platform version checks (libstats)" into rvc-dev am: b797431342
Change-Id: Iaa9b4d4e650c23cd5fc761047919fad8cf82b837
2020-05-11 18:00:34 +00:00