Commit graph

19990 commits

Author SHA1 Message Date
Adam Seaton
a3ff1155e5 Revert "Update Security String from 08-05 to 2019-08-01 Bug:126590667"
This reverts commit ef7c2c7915.

Reason for revert: Resolve string downgrade issue

Change-Id: I28831f2592bba09907b76c7d5ac46326a9c1e9f8
(cherry picked from commit 0c355124bf)
2019-06-17 17:21:53 +00:00
android-build-team Robot
2e1450709a Make change and version bump to QQ1A.190617.001
Change-Id: Id4c561643c2e32ddfeac5f94eebcd160278ac48f
2019-06-16 23:20:35 +00:00
android-build-team Robot
0282e08654 Make change and version bump to QQ1A.190616.001
Change-Id: Id35e8bce642efbd9a47c5baa2e7dc97a2bc3de53
2019-06-15 23:21:26 +00:00
TreeHugger Robot
7730dfc659 Merge "Fail build when sum of sizes of logical partitions exceeds OEM-set limit" into qt-r1-dev 2019-06-14 23:26:24 +00:00
Paul Scovanner
51b942fbe4 Update Security String from 08-05 to 2019-08-01 Bug:126590667 am: ead61ed19e
am: ef7c2c7915

Change-Id: I39ff01e6a0a2d7a1bc0f3c3d655c63ff9363f10e
2019-06-14 13:37:35 -07:00
Hridya Valsaraju
645bc41ecb Fail build when sum of sizes of logical partitions exceeds OEM-set limit
BOARD_SUPER_PARTITION_ERROR_LIMIT can be set by OEMs to cause a
build failure when the sum of sizes of logical partitions exceeds the same.
It is set to BOARD_SUPER_PARTITION_SIZE by default.

Bug: 133329143
Test: mmm -j32

Change-Id: Ief85c9ab3e3b9d071cd22b70e13b5c64bb784b9c
Merged-In: Ief85c9ab3e3b9d071cd22b70e13b5c64bb784b9c
(cherry picked from commit 219b6294dc)
2019-06-14 20:24:17 +00:00
Paul Scovanner
ef7c2c7915 Update Security String from 08-05 to 2019-08-01 Bug:126590667
am: ead61ed19e

Change-Id: Iaf434bf5690c3c50371bb11266d300ab7d335184
2019-06-14 13:22:34 -07:00
Hridya Valsaraju
c624484135 Print a warning when sum of sizes of logical partitions an OEM-set limit
BOARD_SUPER_PARTITION_WARN_LIMIT can be set by OEMs to print
a warning when the sum of sizes of logical partitions exceed the same.
It is set to 95% of BOARD_SUPER_PARTITION_SIZE by default.

Bug: 133329143
Test: mmm -j32

Change-Id: I7d3bedd970a92be60991898e436f63d914359301
Merged-In: I7d3bedd970a92be60991898e436f63d914359301
(cherry picked from commit 6fab18a7eb)
2019-06-13 16:49:46 -07:00
android-build-team Robot
111a94b7c9 Version bump to QQ1A.190613.002 [core/build_id.mk]
Change-Id: Iaa4b33e662be205d0cddebc16b3efaeec7181424
2019-06-13 19:58:58 +00:00
android-build-team Robot
cea0613297 Make change and version bump to QQ1A.190613.001
Change-Id: Idafb741cb1daee62d1cc339205fc825543a8ceda
2019-06-13 03:22:17 +00:00
Paul Scovanner
3a25bc8b55 Update Security String to 2019-08-05 Bug:126590667
am: a3e1c57a95

Change-Id: I0b10bab75834759c3bd216fc77c38c84b445c4e2
2019-06-12 16:06:18 -07:00
android-build-team Robot
017d54c8fb Version bump to QQ1A.190612.003 [core/build_id.mk]
Change-Id: I574120036665118aa5252e57a72ffc2cd317fc63
2019-06-12 22:59:36 +00:00
Paul Scovanner
ead61ed19e Update Security String from 08-05 to 2019-08-01
Bug:126590667
2019-06-12 22:51:45 +00:00
android-build-team Robot
ea9a041a31 Make change and version bump to QQ1A.190612.002
Change-Id: Ic848196d1284be1e9cca2e8e363d25b74c8af23f
2019-06-12 04:15:42 +00:00
android-build-team Robot
7a35f1e622 Make change and version bump to QQ1A.190612.001
Change-Id: I07321cecc77d149b675730b738113e149156274b
2019-06-12 03:25:48 +00:00
Paul Scovanner
a3e1c57a95 Update Security String to 2019-08-05
Bug:126590667
2019-06-11 19:46:33 +00:00
android-build-team Robot
8d96eefaf8 Make change and version bump to QQ1A.190611.001
Change-Id: I1b34f9022fc59e0a9fdd7804e174fdc54ba722b5
2019-06-11 03:18:48 +00:00
android-build-team Robot
9b6093b895 Make change and version bump to QQ1A.190610.001
Change-Id: I6a429ed0af22636c14294da72e7db4764a0f5340
2019-06-09 23:19:47 +00:00
android-build-team Robot
4b5188783d Make change and version bump to QQ1A.190609.001
Change-Id: I7d6c06fa2ec5b9ce03e67612d77eb993f3e4e2ff
2019-06-08 23:21:22 +00:00
android-build-team Robot
75cba2ac01 Version bump to QQ1A.190606.002 [core/build_id.mk]
Change-Id: I3d8b1b1bc57da9a899bd3c181255227acb27ef10
2019-06-07 01:58:51 +00:00
android-build-team Robot
30819d4413 Make change and version bump to QQ1A.190606.001
Change-Id: Ia9ca25f5e3fca630e4e332e824a328aab1d0e6bb
2019-06-06 06:59:16 +00:00
Tao Bao
97a6690a23 Rebuild recovery-from-boot patch when calling add_img_to_target_files.
When using Verified Boot 2.0, releasetools specifies a salt value based
on build fingerprint, so that to give idempotent images.

However, the change that removed static `ro.build.fingerprint` [1] broke
the behavior, as common.LoadInfoDict still relies on fingerprints.
Without a fixed salt, the first call to make_recovery_patch.py and the
second one (which writes IMAGES/{boot,recovery}.img) will see different
images, which leads to install-recovery.sh failure.

Note that currently there's a dependency that requires getting bootable
images through two separate calls. make_recovery_patch.py has to happen
first to get (placeholder) files in the system image. We then generate
canned fs_config files, and finally use add_img_to_target_files.py to
write the images.

This CL adds a quick workaround to force rebuilding the
recovery-from-boot patch while calling add_img_to_target_files.py.

[1] https://android-review.googlesource.com/c/platform/build/+/892933

Bug: 134123803
Bug: 134525174
Test: TreeHugger
Test: Build a non-A/B target that uses AVB. Run validate_target_files.py
      on the generated target_files.zip.
Change-Id: I5859e30be63bfd54398cf41fd2d907f15285f560
Merged-In: I5859e30be63bfd54398cf41fd2d907f15285f560
(cherry picked from commit 4978fa99d1)
2019-06-05 22:04:47 -07:00
android-build-team Robot
8ff869a7d2 Make change and version bump to QQ1A.190605.001
Change-Id: I46b9ab521a7757a7b8032638b52b9bc778d5edc6
2019-06-05 03:20:23 +00:00
android-build-team Robot
a4ccde4da2 Make change and version bump to QQ1A.190604.001
Change-Id: I323a3a7d11a549b6039c947a01db798132e51355
2019-06-04 03:23:21 +00:00
android-build-team Robot
920dfd1f65 Make change and version bump to QQ1A.190603.001
Change-Id: I5dd3e2935ae0770001a4ff12a4749be098cab4d7
2019-06-02 23:18:47 +00:00
android-build-team Robot
b7ef307108 Make change and version bump to QQ1A.190602.001
Change-Id: I92f9df14b18efa407d0d4fa2fd7c3537a853464c
2019-06-01 23:21:36 +00:00
android-build-team Robot
f4cc8e11b7 Version bump to QQ1A.190530.004 [core/build_id.mk]
Change-Id: Ia153e4a7499d844860b5d65c8bca42f47d9819fc
2019-05-31 18:39:43 +00:00
android-build-team Robot
da68ac05ce Version bump to QQ1A.190530.003 [core/build_id.mk]
Change-Id: I5235c1df2c65e911aa200f5f2d40a277d9c1e68f
2019-05-31 02:51:00 +00:00
android-build-team Robot
061303c923 Version bump to QQ1A.190530.002 [core/build_id.mk]
Change-Id: I84f149d5360681804c78fb417136b93b178f0b47
2019-05-30 20:03:19 +00:00
Alan Viverette
c45849fc0c Remove obsolete Support Library guidance from version_defaults.mk
Test: n/a docs only
Fixes: 133228727
Change-Id: I10cdd9a4dfe8c508417f7b80320e308c236f2c8e
2019-05-30 16:57:25 +00:00
android-build-team Robot
f898929326 Make change and version bump to QQ1A.190530.001
Change-Id: I44fd6d367b608e55e90a38e267df04cb691c4b82
2019-05-30 03:18:43 +00:00
android-build-team Robot
4d5c1d84c0 Version bump to QQ1A.190529.002 [core/build_id.mk]
Change-Id: Id04d38fa12c1bcf36eb3d67a845ebc2faea1abb6
2019-05-29 20:46:44 +00:00
android-build-team Robot
d81166e6c1 Make change and version bump to QQ1A.190529.001
Change-Id: Id6ad6c28f8d676172480fa2276876fdb16d5b94e
2019-05-29 03:17:32 +00:00
android-build-team Robot
961f1ca425 Version bump to QQ1A.190528.002 [core/build_id.mk]
Change-Id: Ie931dcac8a79a56029542b8718f78dff47015e8f
2019-05-28 23:06:21 +00:00
android-build-team Robot
f628c0ceb0 Make change and version bump to QQ1A.190528.001
Change-Id: I8e4eb31d8a4b8677bc7f2b8ea75903c843d117dc
2019-05-28 03:18:16 +00:00
android-build-team Robot
9399a7e567 Make change and version bump to QQ1A.190527.001
Change-Id: I10e7c1dffb12d1330ab86729d3aaec7ce58d246c
2019-05-26 23:18:19 +00:00
android-build-team Robot
c823d3b5e1 Make change and version bump to QQ1A.190526.001
Change-Id: I79b60aa82b84319e3335fc799b92c67173a044b7
2019-05-25 23:20:37 +00:00
TreeHugger Robot
f862715103 Merge "Allow for the DTB image to be built by the Android build system." into qt-dev 2019-05-24 17:34:27 +00:00
android-build-team Robot
ec5fa5b6fb Make change and version bump to QQ1A.190523.001
Change-Id: I4089d9a577695cf89a50f28c1c1819cba870f5be
2019-05-23 03:17:31 +00:00
android-build-team Robot
517c116765 Version bump to QQ1A.190522.003 [core/build_id.mk]
Change-Id: I163ad5e2548ad88f4d3f2f01a9f712b90de726a0
2019-05-23 00:26:59 +00:00
Hridya Valsaraju
5b8f78fbe8 Allow for the DTB image to be built by the Android build system.
The current solution expects BOARD_PREBUILT_DTBIMAGE_DIR to
contain prebuilt DTB files that are concatenated by the build system
to create $OUT/dtb.img. In order to accommodate devices that build
the dtb image locally, when BOARD_PREBUILT_DTBIMAGE_DIR is undefined,
make boot.img creation depend only on $OUT/dtb.img.

Bug: 133161451
Test: Build with BOARD_PREBUILT_DTBIMAGE_DIR undefined and verify
using unpack_bootimg.py that $OUT/dtb.img was included in boot.img.

Change-Id: Iae2c634ccdc1d83589b26d382882f75fb8565a31
Merged-In: Iae2c634ccdc1d83589b26d382882f75fb8565a31
2019-05-22 15:55:47 -07:00
android-build-team Robot
2a2cea9d41 Version bump to QQ1A.190522.002 [core/build_id.mk]
Change-Id: I8ff2608b8a1ac9f2e3e7eb579556e727419305d2
2019-05-22 21:33:28 +00:00
Bowgo Tsai
33ff602070 Moving /odm/build.prop to /odm/etc/buid.prop
In device root directory, we have the following symlinks:
  - /odm/app -> /vendor/odm/app
  - /odm/bin -> /vendor/odm/bin
  - /odm/etc -> /vendor/odm/etc
  ...

This allows the Generic System Image (GSI) to be used on both devices:
  1) Has a physical odm partition, where those symlink will be hidden
     when /odm is used as the mount point
  2) Has no physical odm partition and fallback to /vendor/odm/.

We can't just have the symlink /odm -> /vendor/odm, because the former
devices won't have /vendor/odm directory, which leads to mount failure
when the mount point /odm is resolved to /vendor/odm.

The existing /vendor/odm/build.prop won't be loaded in the latter
devices, because there is no symlink:
    - /odm/build.prop -> /vendor/odm/build.prop.

Note that init blocks reading through direct symlinks (O_NOFOLLOW) so
the above symlink won't work either. This CL moves the odm build.prop
to /odm/etc/build.prop for init to load it (symlinks in earlier
components of the path will still be followed by O_NOFOLLOW).

Bug: 132128501
Test: boot a device and checks /odm/etc/build.prop is loaded
Test: make dist with an odm.img, checks $OUT/odm/etc/build.prop is loaded
Change-Id: I6f88763db755c9ec6068bfdd9cee81c19d72e9d7
Merged-In: I6f88763db755c9ec6068bfdd9cee81c19d72e9d7
(cherry picked from commit 6c62884000)
2019-05-22 16:14:53 +08:00
android-build-team Robot
f038399a43 Make change and version bump to QQ1A.190522.001
Change-Id: Ie83d539713671ec386eb0d3b74124bdbed7417ea
2019-05-22 03:18:43 +00:00
android-build-team Robot
ff03abaad3 Version bump to QQ1A.190521.002 [core/build_id.mk]
Change-Id: I2b6cb2553b7612436783f7610cfed9268615e288
2019-05-21 22:46:35 +00:00
android-build-team Robot
e06a1de864 Make change and version bump to QQ1A.190521.001
Change-Id: Id88f21e32e6bf35da613d13547dbc7b6f9c64d65
2019-05-21 03:17:04 +00:00
android-build-team Robot
10aa92aef1 Version bump to QQ1A.190520.002 [core/build_id.mk]
Change-Id: I9d7472bc8e1fa0b0a0e256ea4db3db8e43079f83
2019-05-20 21:07:39 +00:00
android-build-team Robot
6f5e7a9faa Make change and version bump to QQ1A.190520.001
Change-Id: I9a0fbf73472b0a15dbf5d205d48d3200176a8a8c
2019-05-19 23:18:26 +00:00
android-build-team Robot
ef33b15151 Make change and version bump to QQ1A.190519.001
Change-Id: I3cf752d28395dd8f1733340435772c3861b3f9d7
2019-05-18 23:35:56 +00:00
Bowgo Tsai
ce8b063507 Appending per-partition os_version into AVB props
os_version is important for keymaster version binding, where it
refuses to perform operations with a key that is bound to an old
system version.  This ensures that an attacker who discovers a
weakness in an old version of system or TEE software cannot roll a
device back to the vulnerable version and use keys created with the
newer version.

Previously, os_version for system.img is added into boot.img header
for bootloader to read the value then pass to TEE before booting the
HLOS. However, with project Treble to modularize each partition, all
images are now in the trajectory to be built independently (still
on-going). Also, in the Generic System Image (GSI) compliance test,
the os_version in OEM's boot.img cannot reflect the actual version of
GSI.

This CL adds per-partition os_versions into AVB metadata, which is
readable by bootloader via libavb without file system dependency. It's
still unclear for how os_version in non-system partition should be used.
We just add them for completeness here.

See more details in:
https://source.android.com/security/keystore/version-binding

Bug: 132233601
Test: build and avbtool info_image $OUT/vbmeta.img
      - Prop: com.android.build.boot.os_version -> '10'
      - Prop: com.android.build.system.os_version -> '10'
      - Prop: com.android.build.system.security_patch -> '2019-06-05'
      - Prop: com.android.build.vendor.os_version -> '10'
      - Prop: com.android.build.vendor.security_patch -> '2019-06-05'
      - Prop: com.android.build.product.os_version -> '10'
      - Prop: com.android.build.product.security_patch -> '2019-06-05'

Change-Id: I21a77420f2e8a3456f7a8cae5158eb8fc41319e7
Merged-In: I21a77420f2e8a3456f7a8cae5158eb8fc41319e7
(cherry picked from commit 9b54801b58)
2019-05-16 21:46:53 +08:00