Commit Graph

8413 Commits

Author SHA1 Message Date
Kiyoung Kim 7a0a80ea28 Merge "Do not execute linkerconfig from recovery"
am: b12e54c4f1

Change-Id: Ica8a524984cc85a05c23a03133693586cb7e4f80
2019-12-17 17:01:34 -08:00
Kiyoung Kim b12e54c4f1 Merge "Do not execute linkerconfig from recovery" 2019-12-18 00:55:03 +00:00
Kiyoung Kim ea2b683f6e Do not execute linkerconfig from recovery
Linkerconfig binary itself should be built as static, so size of
executable is hard to be reduced. However, this used lots of space from
recovery so only small space left in it. To avoid this linker config
from recovery should be generated within build time and use prebuilt
one. Prebuilt ld.config.txt will be located under /system/etc as before,
and init will copy the file into /linkerconfig so we can use same
location for both recovery and normal boot.

Bug: 146384333
Test: m -j passed && crosshatch bootloader worked with this change
Change-Id: I96300f1c8301167234787274820086a4c6ea0e6e
2019-12-17 15:05:54 +09:00
Adrian Salido 305417d49e Merge "minui: add ARGB_8888 format"
am: 38f07f0ba4

Change-Id: I76d13dd351f708c385a84280403cf21f910be9c1
2019-12-13 15:47:27 -08:00
Treehugger Robot 38f07f0ba4 Merge "minui: add ARGB_8888 format" 2019-12-13 23:44:50 +00:00
Adrian Salido cc7b7eb737 minui: add ARGB_8888 format
Minui currently really only supports composing in 2 different formats
(see gr_color()) with ALPHA always as MSB. However, some devices
interpret PixelFormat as either Big Endian (i.e. ARGB has alpha at MSB)
or Little Endian (i.e. BGRA has alpha at MSB).

This change attempts to give multiple options to specify the same format
depending on device interpretation, while keeping just 2 different
composition formats supported by minui.
* ARGB + BGRA: Pixels have (A)lpha at MSB and (B)lue at LSB
* RGBX + ABGR: Pixels have (A)lpha at MSB and (R)ed at LSB

With this in mind, limiting the use of png_set_bgr() to happen only for
(ARGB/BGRA) combination while leaving (RGBX/ABGR) unchanged.

Bug: 143480444
Test: Boot device with TARGET_RECOVERY_PIXEL_FORMAT := <<all>>
Change-Id: Ia0f94ccbc564b8def7c9416483712ff1abbbf49a
2019-12-13 10:53:33 -08:00
Kiyoung Kim c3b430d816 Merge "Generate linker config from recovery init"
am: 17090d7f53

Change-Id: I6c0c59370478da3c57e0971be89fadbc4a856416
2019-12-12 17:13:50 -08:00
Kiyoung Kim 17090d7f53 Merge "Generate linker config from recovery init" 2019-12-13 01:09:58 +00:00
Kiyoung Kim 3a88a1748b Generate linker config from recovery init
Generate linker config from recovery init to be used from recovery
processes.

Bug: 139638519
Test: Tested from crosshatch
Change-Id: I777a8baf08254b07375b8039bb252864637e29e7
2019-12-12 14:40:37 +09:00
Tianjie Xu df59e19ca3 Merge "Revert "Add mechanism for device-specific loop images""
am: fff38d9446

Change-Id: Ia86a156bbb90c39edf470b04892842bb27251348
2019-12-09 14:36:27 -08:00
Tianjie Xu fff38d9446 Merge "Revert "Add mechanism for device-specific loop images"" 2019-12-09 22:33:15 +00:00
Joshua Lambert 94a83be42a Revert "Add mechanism for device-specific loop images"
This reverts commit fd6a2c226d.

Reason for revert: Mechanism already exists:
https://source.android.com/devices/tech/ota/nonab/device_code#recovery-ui-images

Change-Id: Ic7b640b5d435cfb6f5c2610a2534405fb9415936
2019-12-09 20:24:18 +00:00
Tianjie Xu 5446037552 Merge "Add mechanism for device-specific loop images"
am: d81bb36b5b

Change-Id: I12e9dc1f21185040bdae10fa5c63e08f3cfccb9a
2019-12-06 14:53:32 -08:00
Tianjie Xu d81bb36b5b Merge "Add mechanism for device-specific loop images" 2019-12-06 22:46:01 +00:00
Joshua Lambert fd6a2c226d Add mechanism for device-specific loop images
Bug: 144974129
Test: Manual - Testing OTA and Factory Reset
1) Tested with matching device name ({devicename}00000.png)
2) Tested with no matching device name (uses loop00000.png default)
3) Tested with empty string device name (uses loop00000.png default)

Change-Id: I4c73af82ab8826d1a43fe193a7616bc219d536e4
2019-12-06 12:56:50 -08:00
Xin Li 5af5b037db Merge "Merge Android10 QPR1 into AOSP master"
am: 2a9ddbb108

Change-Id: I2adee5408e91984a7bbd357a7b925155c496c028
2019-12-03 16:07:23 -08:00
Treehugger Robot 2a9ddbb108 Merge "Merge Android10 QPR1 into AOSP master" 2019-12-03 23:14:58 +00:00
Xin Li 9a6db8d62d Merge Android10 QPR1 into AOSP master
Bug: 145570283
Change-Id: I630eb6403a72db8b7db6857d8c12284aa9ffa1ef
2019-12-02 21:25:01 -08:00
Tianjie Xu 8295228a79 Merge "Move misc_writer to hardare/google/pixel"
am: 21d3b89cc5

Change-Id: I031db0c335c66db5a976064995570c81e92246e0
2019-12-02 15:40:26 -08:00
Tianjie Xu 21d3b89cc5 Merge "Move misc_writer to hardare/google/pixel" 2019-12-02 23:34:11 +00:00
David Anderson da8658b78b Merge "bootloader_message: Add a magic header to the Virtual A/B message block."
am: f78b7a7b94

Change-Id: I81378cf209b929390c88bc83e51fd1f7bfa6fcb3
2019-11-22 12:16:10 -08:00
David Anderson f78b7a7b94 Merge "bootloader_message: Add a magic header to the Virtual A/B message block." 2019-11-22 20:02:36 +00:00
David Anderson 682d2a5db2 bootloader_message: Add a magic header to the Virtual A/B message block.
This adds a sanity check in addition to the version number in case misc
contains random bits.

Bug: 139156011
Test: manual test
Change-Id: Ie4f3731d2b1795340881c88e0c4eec9cd4432653
2019-11-20 16:23:52 -08:00
Tianjie Xu 6ca0488c4a Merge "Clear the warm_reset flag after boot is successful"
am: ca18e7fe5a

Change-Id: I6253c40ca4649f62ac8383acdbbdc712dde98609
2019-11-18 15:39:42 -08:00
Tianjie Xu ca18e7fe5a Merge "Clear the warm_reset flag after boot is successful" 2019-11-18 23:15:43 +00:00
David Anderson bc4b39efff Merge "Force merges to complete before wiping data or metadata."
am: 8444dec7ac

Change-Id: If50fd0536584c8e1271ea6212c9fe76e9b208b22
2019-11-14 20:38:26 -08:00
David Anderson 8444dec7ac Merge "Force merges to complete before wiping data or metadata." 2019-11-15 04:27:59 +00:00
Tianjie Xu 88bf6d20eb Clear the warm_reset flag after boot is successful
The property is set to inform kernel to do a warm_reset on the next
reboot. This is useful to persist the logs to debug device boot
failures. After the slot has been marked as boot successful, we can drop
the warm_reset flag to avoid the performance overhead on the next
reboot.

Bug: 143489994
Test: check the property is set to 0 by update_verifier
Change-Id: I722fb1906e6efa56dfc4ad7beccd5e2ba7e0ef7c
2019-11-14 17:43:56 -08:00
Tianjie Xu 28064ccf0b Move misc_writer to hardare/google/pixel
Because the library is pixel specific.

Bug: 131775112
Test: build
Change-Id: Ib62230bb2ab4d67864827e08375250fbfe189ed4
2019-11-13 15:59:55 -08:00
Tianjie Xu 85808f6a69 Merge "Consolidate the vendor space misc usage for Pixels"
am: 423f0d109b

Change-Id: Iebafc18e0ae8ee54aab3008a7767a3901bb038cd
2019-11-13 14:35:07 -08:00
Tianjie Xu 423f0d109b Merge "Consolidate the vendor space misc usage for Pixels" 2019-11-13 22:24:19 +00:00
Tom Cherry cfcadc3b33 Merge "Fixed typo during stopping fastboot"
am: 8834b4ea0a

Change-Id: I80d1cf7fb447f4377b3cac7fd495289af1c961a9
2019-11-13 12:32:20 -08:00
Tom Cherry 8834b4ea0a Merge "Fixed typo during stopping fastboot" 2019-11-13 20:18:22 +00:00
Tom Cherry 054861f9eb Merge "Move init and ueventd scripts from / to /system/etc"
am: 154f7e9b79

Change-Id: I60b076de3aefa8dc40cac3b36965857ab48429f8
2019-11-13 08:05:59 -08:00
Tom Cherry 154f7e9b79 Merge "Move init and ueventd scripts from / to /system/etc" 2019-11-13 14:36:47 +00:00
Dmytro Prokopchuk df35405a4b Fixed typo during stopping fastboot
Change-Id: I0a589d068807e255654c7e62831423f944b5cdc3
Signed-off-by: Dmytro Prokopchuk <dmytro.prokopchuk@globallogic.com>
2019-11-13 13:30:17 +02:00
Tianjie Xu 3d57c84476 Consolidate the vendor space misc usage for Pixels
The layout of the vendor space /misc partition was pretty confusing and
lead to some usage conflicts. To formalize the layout, we create a pixel
specific library with the definition & offset of various flags. The new
library also handles the R/W. As a result, we will leave system domain
/misc definitions in the libbootloader_message.

We also switch the misc_writer binary to use more specific options
instead of writing an arbitrary hex string. So we can avoid redefining
the string & offset in both init script and recovery ui.

Bug: 131775112
Test: unit tests pass, run misc_writer and check contents of /misc
Change-Id: I00f8842a81d1929e31a1de4d5eb09575ffad47c0
2019-11-12 10:53:04 -08:00
David Anderson 89d2d050a0 Force merges to complete before wiping data or metadata.
After an OTA is applied, a wipe in recovery may overwrite components of
dynamic partitions living in userdata. If the OTA has not yet begun
merging, we mark the current slot unbootable. If the OTA has begun
merging, we wait for the merge to complete. This logic is encapsulated
in libsnapshot.

Bug: 139156011
Test: manual test
Change-Id: Id6544a1b8583afcbba11559d46214ec2e68ffa40
2019-11-11 01:02:12 +00:00
David Anderson ff8131a493 Merge "bootloader_message: Add helpers for handling IBootControl MergeStatus."
am: 405f4d3552

Change-Id: Ic37fa503b0e3eea75e2c7076e01979e05b3fe2b8
2019-11-09 07:13:15 -08:00
David Anderson 405f4d3552 Merge "bootloader_message: Add helpers for handling IBootControl MergeStatus." 2019-11-09 15:04:52 +00:00
David Anderson cf8427af89 bootloader_message: Add helpers for handling IBootControl MergeStatus.
Move merge_status from bootloader_control_ab, which is in vendor space,
to a new generic AOSP struct in system space. This will allow more
devices to share the same HAL implementation.

This patch also changes libboot_control to compensate for merge_status
moving out of vendor space. The reference HAL library now also provides
separate helper functions for managing the merge status, so devices
using a custom boot control HAL can still take advantage of the new misc
implementation.

Bug: 139156011
Test: manual test
Change-Id: I5cd824e25f9d07aad1476301def5cdc3f506b029
2019-11-08 15:22:21 -08:00
Tom Cherry bcd3f35462 Move init and ueventd scripts from / to /system/etc
There is no reason for these scripts to continue to exist in /, when
they are better suited for /system/etc.  There are problems keeping
them at / as well, particularly that they cannot be updated with
overlayfs.

Bug: 131087886
Bug: 140313207
Test: build/boot + boot to recovery
Merged-In: I1fb6690d4302a1884d8521c21a9754b2ca710d5a
Change-Id: I1fb6690d4302a1884d8521c21a9754b2ca710d5a
2019-11-07 11:29:06 -08:00
Tianjie Xu 4e0d813e39 Merge "Stop setting usb config from recovery init script"
am: 6105aa1a4a

Change-Id: I39a81f9e1e8327794f3f6032508181645870c9cd
2019-11-07 11:14:55 -08:00
Tianjie Xu 6105aa1a4a Merge "Stop setting usb config from recovery init script" 2019-11-07 18:25:07 +00:00
Tom Cherry 0a19ef8cb6 Stop setting usb config from recovery init script
We used to set sys.usb.config to adb in the init script. And the purpose
is to start adbd. This is a duplicate of code because we always check and
reset the usb config in recovery_main.

Test: check adbd starts
Change-Id: I6e2842ff8aebf6ccf3bd3f2ae85323899a2b9de4
2019-11-06 23:04:36 -08:00
David Anderson bf23ee57e4 Merge "bootloader_message: Carve out space reserved for system."
am: 8243388d57

Change-Id: I1c124ae8e05e0fbb76b95ce27f3c56ce9b1740be
2019-11-05 14:31:27 -08:00
David Anderson 8243388d57 Merge "bootloader_message: Carve out space reserved for system." 2019-11-05 22:16:16 +00:00
Tianjie Xu e5288e6b69 Merge "Start adbd in user mode if bootloader is unlocked"
am: b65dd9cb0c

Change-Id: I0daecb3e2a15c449babfc94d6f3deca8b55a4924
2019-11-05 14:00:48 -08:00
Tianjie Xu b65dd9cb0c Merge "Start adbd in user mode if bootloader is unlocked" 2019-11-05 21:37:07 +00:00
David Anderson 4ff4cbdd6c bootloader_message: Carve out space reserved for system.
This reduces the wipe space from 32K to 16K. The wipe space is now
at the 16K-32K region. The 32K-64K region is now "system space", to
complement the vendor space, for generic AOSP usage.

Bug: 139156011
Test: manual test
Change-Id: I1474bfa65a5f21049ab64ec0aee2f4585b55f60f
2019-11-04 15:57:04 -08:00