Commit Graph

25416 Commits

Author SHA1 Message Date
Yifan Hong f5b6603c57 Merge changes I7bd61f74,Ia84e604a,I75e13b92,I0db2af20,I4feac435 am: d2ae9989cd am: e5b97b4714
Original change: https://android-review.googlesource.com/c/platform/build/+/1478502

Change-Id: Ib989f22b0b86a386818c94d4d1ec39e3af88d7d0
2020-10-30 17:40:28 +00:00
Yifan Hong d2ae9989cd Merge changes I7bd61f74,Ia84e604a,I75e13b92,I0db2af20,I4feac435
* changes:
  Mount generic ramdisk as readwrite.
  Do not put GENERIC_KERNEL_CMDLINE in recovery image.
  Move common code out of the conditional.
  Remove device-specific bits if recovery_as_boot
  Do not assume GKI just with vendor_boot.
2020-10-30 16:52:28 +00:00
Paul Duffin 8bf8a1c55a Merge "Move boot jars package check to Soong" am: 58d6758ea1 am: 69fb86458c
Original change: https://android-review.googlesource.com/c/platform/build/+/1478737

Change-Id: Ic670e66bdb512e709c433a2e75ff9b1ff06616ad
2020-10-30 11:14:53 +00:00
Paul Duffin 58d6758ea1 Merge "Move boot jars package check to Soong" 2020-10-30 10:06:46 +00:00
Alistair Delva f1d308264c Merge "Allow flashing erofs system imgs" am: 38d49ca61a am: b3d45c1db1
Original change: https://android-review.googlesource.com/c/platform/build/+/1353441

Change-Id: Ib231a6e90b32f18c39b7cde8766cc20cdeff8be2
2020-10-30 07:35:13 +00:00
Alistair Delva 38d49ca61a Merge "Allow flashing erofs system imgs" 2020-10-30 06:41:25 +00:00
Joseph Murphy 4586a367b2 Merge "Changes Robolectric test suite tag to its own value to enable filtering these in ATP." am: 67e1341100 am: 51a8b2b3bd
Original change: https://android-review.googlesource.com/c/platform/build/+/1477422

Change-Id: Ie6f51afb072c6baa8c8116d02e0ec43998a64cb5
2020-10-29 11:17:57 +00:00
Paul Duffin bbd4fae4d7 Move boot jars package check to Soong
Passes the SKIP_BOOT_JARS_CHECK property through to Soong and removes
the boot jars check. Moves the check_boot_jars directory containing the
script and data file into build/soong/scripts.

Test: m check-boot-jars - for failing and passing cases
      verified manually that apart from path differences the same
      files (same check sum) were checked in both old make checks and
      the new Soong ones
Bug: 171479578
Change-Id: I61c128806065befce239bbdd5491567827e1b2f5
2020-10-29 11:07:55 +00:00
Yifan Hong 78b55b2244 Mount generic ramdisk as readwrite.
With this change, first stage init can prepare and move
resources to accomodate devices with and without a dedicated
recovery partition.

Test: build with and without recovery partition, and manually inspect
Bug: 171512004

Change-Id: I7bd61f74c16ee77f3f05dc208e0f3cfe81e302b0
2020-10-28 17:05:18 -07:00
Yifan Hong 78860164d0 Do not put GENERIC_KERNEL_CMDLINE in recovery image.
The GENERIC_KERNEL_CMDLINE should only be in the generic boot image.
If device uses recovery-as-boot, it never uses generic boot image
because on devices with generic boot image, recovery resources are
moved to vendor_boot instead.

Bug: 171512004
Test: builds

Change-Id: Ia84e604a8ded28af39c7f1861ff5d3b3af55849f
2020-10-28 17:05:18 -07:00
Yifan Hong c56931c173 Move common code out of the conditional.
Test: builds
Change-Id: I75e13b929dbdb31785a59898579ed14bcc3eef60
2020-10-28 17:05:18 -07:00
Yifan Hong 3941a876de Remove device-specific bits if recovery_as_boot
On legacy devices (launched with R and below), if device:
- has a vendor_boot partition, and
- uses recovery_as_boot

Then, when building the recovery/boot partition, the
device-specific bits, including dtb/kernel base/pagesize should
be moved to vendor_boot.

Previously, it is incorrectly assumed that A/B => recovery_as_boot.
In reality, we do have A/B devices with a dedicated recovery partition.

Note that for devices that uses GKI (BOARD_USES_GENERIC_KERNEL_IMAGE),
recovery_as_boot is never set to true. Instead, recovery resources
are moved to vendor_boot. On these devices, the conditional
'vendor_boot && recovery-as-boot' is always false. Hence:

- If the device has a dedicated recovery partition, it should use V3 header,
  and dtb/base/pagesize won't be in recovery header.
- If device does not have a dedicated recovery partition, the recovery
  image won't be built.

Test: builds
Change-Id: I0db2af20470cbe8a21044a984cccf264590aaccf
2020-10-28 17:05:18 -07:00
Yifan Hong 46aff099d2 Do not assume GKI just with vendor_boot.
This change ensures changes to GENERIC_KERNEL_CMDLINE only affects
devices that explicitly says it uses GKI/generic boot image.

In details, if the device has vendor_boot, but does not explicitly
specify that it uses GKI/generic boot image, do not include
GENERIC_KERNEL_CMDLINE in boot. boot cmdline is left empty
in this case.

The old logic:
- If device uses GKI *OR* has vendor_boot:
  boot uses GENERIC_KERNEL_CMDLINE, and do not include kernel base
  and pagesize.
  - If device has vendor_boot, INTERNAL_KERNEL_CMDLINE, kernel base
    and pagesize goes in vendor_boot.
- If device does not use GKI nor have vendor_boot:
  boot uses INTERNAL_KERNEL_CMDLINE, and includes kernel base and
  pagesize.

The new logic:
- If using GKI, boot uses GENERIC_KERNEL_CMDLINE. Remove kernel base
   and pagesize because they are device-specific.
- If not using GKI:
  - If building vendor_boot, INTERNAL_KERNEL_CMDLINE, base and
    pagesize goes in vendor_boot; boot does not have cmdline, base or
    pagesize.
  - Otherwise, put them in boot

Comparison of the code before and after:
- If device uses GKI,
  - For boot partition:
    - cmdline continues to be GENERIC_KERNEL_CMDLINE
    - kernel base and pagesize continues to be excluded
  - For vendor_boot partition:
    - cmdline continues to be INTERNAL_KERNEL_CMDLINE
    - kernel base and pagesize continues to be included
- If device does not use GKI:
  - If device has a vendor_boot partition:
    - For boot partition:
      * cmdline changes from GENERIC_KERNEL_CMDLINE to empty
      - kernel base and pagesize continues to be excluded
    - For vendor_boot partition:
      - cmdline continues to be INTERNAL_KERNEL_CMDLINE
      - kernel base and pagesize continues to be included
  - If device does not have a vendor_boot partition:
    - For boot partition:
      - cmdline continues to be INTERNAL_KERNEL_CMDLINE
      - kernel base and pagesize continues to be included

Test: builds
Bug: 171512004

Change-Id: I4feac435698f43ac299b430bff66147057865a62
2020-10-28 17:05:18 -07:00
Joseph Murphy 77c15cb2d4 Changes Robolectric test suite tag to its own value to enable filtering these in ATP.
Bug: b/157635117
Change-Id: I7748ccbef3dd44d1a4a79e9ded5182607c83a20b
2020-10-28 01:09:18 +00:00
Gao Xiang 961041ac80 Allow flashing erofs system imgs
Bug: 158339527
Test: build & boot
Signed-off-by: Gao Xiang <hsiangkao@redhat.com>
Change-Id: Ie74db8ebcd7214ffbec49d42b305b2f3ac2e8c9d
2020-10-28 01:24:39 +08:00
Jaewoong Jung a6c1730ba2 Merge "Remove duplicate quotation marks in apkcerts list." am: 3b27e9104b am: 1cafb2e586
Original change: https://android-review.googlesource.com/c/platform/build/+/1472645

Change-Id: I20413435865e03ca7041b8cbe948d57aa27ef09e
2020-10-26 19:52:20 +00:00
Jaewoong Jung 3b27e9104b Merge "Remove duplicate quotation marks in apkcerts list." 2020-10-26 19:05:00 +00:00
Yifan Hong 9e88729664 Merge "Export BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT to Soong" am: a7a900e256 am: 438be712d9
Original change: https://android-review.googlesource.com/c/platform/build/+/1469693

Change-Id: Ib560fd4e9419571e4c4c94fc5b7c05bdd370d7bd
2020-10-24 01:26:23 +00:00
Yifan Hong a7a900e256 Merge "Export BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT to Soong" 2020-10-24 01:08:16 +00:00
Jaewoong Jung 7b634d345d Remove duplicate quotation marks in apkcerts list.
Fixes: 160845661
Test: Modify dialer cert string && m apkcerts-list
Change-Id: I9da8dd70185057b2e13793dd14387223dc29b052
2020-10-23 14:02:16 -07:00
Dan Shi 44899815ab Merge "Make *TS to include NOTICE file by default" am: e4d4188e4f am: 3641172258
Original change: https://android-review.googlesource.com/c/platform/build/+/1471255

Change-Id: I306f551236db3a460d38b7fca63f8caf1a727a3d
2020-10-23 16:37:09 +00:00
Dan Shi e4d4188e4f Merge "Make *TS to include NOTICE file by default" 2020-10-23 16:09:35 +00:00
Martin Stjernholm fa91696588 Merge "Rename ART release APEX to com.android.art." am: 48d34d8ac0 am: 603cd94611
Original change: https://android-review.googlesource.com/c/platform/build/+/1455024

Change-Id: I1b96e156320ff0410ddf4f824e25bd10f2a56a82
2020-10-23 11:05:19 +00:00
Martin Stjernholm 48d34d8ac0 Merge "Rename ART release APEX to com.android.art." 2020-10-23 10:03:24 +00:00
Dan Shi 413a53066b Make *TS to include NOTICE file by default
Bug: 170487545
Test: none
Change-Id: Ib3f726b847bc2123f0b564d0c3a8f5584720c021
2020-10-22 21:29:37 -07:00
Dan Shi d4c9da4bcc Merge "Package host shared lib for art-host-tests" am: 0b8473591c am: 5f8a512d00
Original change: https://android-review.googlesource.com/c/platform/build/+/1469691

Change-Id: I5efec075fdbd0f0802c3be47025a75066afa200c
2020-10-22 21:47:08 +00:00
Dan Shi 0b8473591c Merge "Package host shared lib for art-host-tests" 2020-10-22 17:39:58 +00:00
Dan Shi cb8655c3b9 Package host shared lib for art-host-tests
Bug: 169111770
Test: m art-host-tests
Change-Id: Ic5a9740977cd9a1f6bdfbbfef81116f7a3cf5e8a
2020-10-21 21:28:34 -07:00
Yifan Hong 21f97e27be Export BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT to Soong
Test: pass
Bug: 156098440
Change-Id: I84f26f7f12c53c0cc120c8122e75f68571794ac7
2020-10-21 15:44:03 -07:00
Tianjie Xu 3b2ec594f0 Merge "Generate partial ota update package if the board defines it" am: f692346758 am: 8d70b61202
Original change: https://android-review.googlesource.com/c/platform/build/+/1464827

Change-Id: I98ab96f893e1187b8297e35dc86c66ffde3bbbeb
2020-10-21 21:09:34 +00:00
Tianjie Xu f692346758 Merge "Generate partial ota update package if the board defines it" 2020-10-21 20:19:10 +00:00
Yifan Hong 790d85a0c1 Merge "Build boot image if BOARD_KERNEL*_BOOTIMAGE_PARTITION_SIZE" am: ffb2a7f9da am: dc506bb556
Original change: https://android-review.googlesource.com/c/platform/build/+/1462543

Change-Id: I5753249b77bbe26d3ec9449c629700d016ed87b5
2020-10-21 19:32:42 +00:00
Yifan Hong ffb2a7f9da Merge "Build boot image if BOARD_KERNEL*_BOOTIMAGE_PARTITION_SIZE" 2020-10-21 18:34:31 +00:00
Julien Desprez 83b516aee2 Merge "Remove the hosttestlib.jar as it shouldn't be needed" am: b4553b74d7 am: beacb14a18
Original change: https://android-review.googlesource.com/c/platform/build/+/1468266

Change-Id: I1ddcbafefc38797ad2cc7b4d052f1a28f756db07
2020-10-21 18:23:07 +00:00
Julien Desprez b4553b74d7 Merge "Remove the hosttestlib.jar as it shouldn't be needed" 2020-10-21 17:55:15 +00:00
Martin Stjernholm c21bd0a42c Rename ART release APEX to com.android.art.
Test: See https://r.android.com/1457217
Bug: 169639321
Change-Id: Ib2e87f9ddb8ea5e7ceb2db0ea12566c0bd58ca75
Merged-In: Ib2e87f9ddb8ea5e7ceb2db0ea12566c0bd58ca75
2020-10-21 15:41:02 +01:00
Jingwen Chen b0c8695140 Merge "symlink_outputs: Add .KATI_SYMLINK_OUTPUTS to build/make/core" am: 0314bfa419 am: 2f2c36b8e1
Original change: https://android-review.googlesource.com/c/platform/build/+/1434013

Change-Id: Iffa1eede6918c8dfa7f5a1fafae18f1d713b0401
2020-10-21 09:43:16 +00:00
Jingwen Chen 7d7f94547a symlink_outputs: Add .KATI_SYMLINK_OUTPUTS to build/make/core
Test: m
Bug: 160568334

Change-Id: Ie6fb4f16bb77845787d277857e17e6aac0a8c11a
2020-10-21 08:55:10 +00:00
Treehugger Robot 075ca1980f Merge "Add BUILD_BROKEN_ENFORCE_SYSPROP_OWNER" am: 8d9added3c am: 412675c3b5
Original change: https://android-review.googlesource.com/c/platform/build/+/1465964

Change-Id: I8360d26b36f0a6cdde6d8197eba949086c3117e5
2020-10-21 01:14:38 +00:00
Treehugger Robot 8d9added3c Merge "Add BUILD_BROKEN_ENFORCE_SYSPROP_OWNER" 2020-10-21 00:26:34 +00:00
Yifan Hong b0850bdbc3 Merge "Do not build recovery-resource.dat if move_recovery_res_to_vendor_boot" am: 9873891bd0 am: 335c4b0960
Original change: https://android-review.googlesource.com/c/platform/build/+/1467994

Change-Id: Ie7d081d08dd84c58e9a9f4f2864bac41beb5d97f
2020-10-20 23:12:01 +00:00
Yifan Hong ebe65f8c0a Build boot image if BOARD_KERNEL*_BOOTIMAGE_PARTITION_SIZE
Also gets the correct partition size and checks correctly.

Test: build aosp_arm64

Change-Id: I004e4b04d225d72db1904b983a6d03a916406085
2020-10-20 15:53:12 -07:00
Yifan Hong 9873891bd0 Merge "Do not build recovery-resource.dat if move_recovery_res_to_vendor_boot" 2020-10-20 22:26:15 +00:00
Tianjie 6bd3b1a7f1 Generate partial ota update package if the board defines it
Many partners have asked for platform support of system-only update.
So we config cuttlefish as an example to support the partial ota
updates. Also make such package available on the build server.
This allows continuous test to ensure the e2e update flow is working.

Bug: 170921953
Test: generate & apply a partial update, check output in presubmit
Change-Id: I79d0abeb1b2be18e6ff88f0455b6de6540a37794
2020-10-20 15:17:33 -07:00
Yifan Hong 47f14dd029 Merge "Reland "Check system manifest against frozen data."" am: 3dd40ccebe am: c75703ca98
Original change: https://android-review.googlesource.com/c/platform/build/+/1467570

Change-Id: I6a5ac7d85df605b2d907efc3d7c1e7ddb1a62739
2020-10-20 21:05:07 +00:00
Treehugger Robot 605eb54154 Merge "Revert "Remove env-var-allowlist"" am: fd8dae609f am: fe4c812bad
Original change: https://android-review.googlesource.com/c/platform/build/+/1465913

Change-Id: I8dd41768ef397889d7cdfecf4f65aaec7482c3a4
2020-10-20 21:04:49 +00:00
Yifan Hong 3dd40ccebe Merge "Reland "Check system manifest against frozen data."" 2020-10-20 20:25:21 +00:00
Julien Desprez 8d5158fdf0 Remove the hosttestlib.jar as it shouldn't be needed
This jar is not needed anymore

Test: make cts
Bug: 171326035
Change-Id: Idb4a6ff0b848b3d813bc0aba97ce9214a9532f44
2020-10-20 13:22:43 -07:00
Yifan Hong ef7a971ded Do not build recovery-resource.dat if move_recovery_res_to_vendor_boot
If recovery resources are moved to vendor_boot, it also means
there's no recovery image to install. Don't build
recovery-resource.dat in this case.

Test: builds with cuttlefish with GKI
Bug: 156098440
Change-Id: I86db08d2dede6af644afadac54ff8beb853f4933
2020-10-20 13:18:04 -07:00
Treehugger Robot fd8dae609f Merge "Revert "Remove env-var-allowlist"" 2020-10-20 19:58:46 +00:00