Commit graph

8434 commits

Author SHA1 Message Date
Steven Moreland
1dccf9c474 Merge "edify: update for bison 3.5"
am: 1477c867f7

Change-Id: I8b3c51a1a420d24639feb1356575832db1d717af
2020-01-15 14:18:52 -08:00
Treehugger Robot
1477c867f7 Merge "edify: update for bison 3.5" 2020-01-15 22:15:54 +00:00
Dan Willemsen
1d5b35dfb5 Merge "Convert update_host_simulator to Android.bp"
am: d3e4ee7b16

Change-Id: Ida439dc9fde87cdad2ac1e43e25668f871d6ece4
2020-01-15 12:07:50 -08:00
Treehugger Robot
d3e4ee7b16 Merge "Convert update_host_simulator to Android.bp" 2020-01-15 20:05:46 +00:00
Dan Willemsen
5a6784168f Convert update_host_simulator to Android.bp
Bug: 130696912
Test: m update_host_simulator
Change-Id: I7b3c0217268a3edcf76548a5c83030050b2d17f3
2020-01-15 09:39:13 -08:00
Steven Moreland
ee3dd45c07 edify: update for bison 3.5
Getting rid of warning, so using new define for turning on verbose
errors:
%define parse.error verbose

Bug: 31194194
Test: N/A
Change-Id: I47c200a1e669b5c5fc53d392f32b4c264a42182d
2020-01-14 20:56:40 +00:00
Stephane Lee
7e1af2dd40 Merge "Fix ioctl FIONREAD call parameters to use int instead of size_t"
am: b17cdb26df

Change-Id: Ia47c5f257f1552e711705bcb974c068c201382ba
2020-01-14 11:07:08 -08:00
Stephane Lee
b17cdb26df Merge "Fix ioctl FIONREAD call parameters to use int instead of size_t" 2020-01-14 18:42:31 +00:00
Stephane Lee
12952cdddb Fix ioctl FIONREAD call parameters to use int instead of size_t
Test: Ensure that calls to inotify_cb succeed; Ensure charger does not
crash

Change-Id: I9a7ca304057313c74ef02fd97223d0ed570c6206
2020-01-13 16:04:44 -08:00
Yifan Hong
2346f5bd6c Merge "Add elsk@ to OWNERS"
am: f52a8782b3

Change-Id: I5815887ff946dcaa88b67965c77950a27f781866
2020-01-08 14:01:14 -08:00
Yifan Hong
f52a8782b3 Merge "Add elsk@ to OWNERS" 2020-01-08 21:35:33 +00:00
Alessio Balsini
bc4b2b44e9 Merge "Mount snapshotted /system in Virtual A/B devices"
am: 5ee782079a

Change-Id: I763c7c0ca0ba5d9e6e6f822efa2e42e5ea1095bc
2020-01-07 12:30:18 -08:00
Treehugger Robot
5ee782079a Merge "Mount snapshotted /system in Virtual A/B devices" 2020-01-07 20:26:43 +00:00
Yifan Hong
cf58738b89 Add elsk@ to OWNERS
Test: none
Change-Id: Ibe39304e7ad2e23377853ef5753f7873348ff24b
2020-01-07 11:35:06 -08:00
Peter Collingbourne
dddedcc3de Merge "Link libvndksupport dynamically instead of statically."
am: 8b9ac5b83d

Change-Id: Ib5eaa527fbba27b700f6efc8b2536320252e4ee3
2019-12-19 10:03:09 -08:00
Peter Collingbourne
8b9ac5b83d Merge "Link libvndksupport dynamically instead of statically." 2019-12-19 17:27:37 +00:00
Yifan Hong
567ae2f9e1 Merge "Delete VINTF compatibility check during OTA."
am: cae99c43de

Change-Id: I8ec2ee4efdadf39dd1543c1929e5e9bb11500a8e
2019-12-18 15:19:40 -08:00
Yifan Hong
cae99c43de Merge "Delete VINTF compatibility check during OTA." 2019-12-18 23:15:51 +00:00
Yifan Hong
c77bb70166 Delete VINTF compatibility check during OTA.
Test: sideload OTA
Bug: 139300422
Change-Id: I3369b69242ccd7a64540a0c2d754a5d6fc50d072
2019-12-18 12:14:50 -08:00
Peter Collingbourne
8f2f0d09ea Link libvndksupport dynamically instead of statically.
Bug: 146456667
Change-Id: I839223d8fbc365fd3271634143b117604f6aa879
2019-12-17 17:51:42 -08:00
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
Alessio Balsini
a9665ced57 Mount snapshotted /system in Virtual A/B devices
Mounting /system in Virtual A/B devices may require the creation of the
associated snapshot devices.
This patch performs all the required initializations prior to attempting
the mount of /system.

Bug: 139157327
Test: manual /system partition mount on VAB device during OTA
Depends-on: I7337bdd38d7016d12d3ee42be1c7893b10e9116d
Change-Id: I71a9dfc57e1a1354f1f1edc5d287aca93c0c8924
Signed-off-by: Alessio Balsini <balsini@google.com>
2019-12-16 21:25:45 +00: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