Commit graph

67328 commits

Author SHA1 Message Date
Treehugger Robot
5d8217afb7 Merge "Fix m bootimage_test_harness failure" 2021-03-05 15:03:39 +00:00
Tianjie Xu
56cc49eab9 Merge changes I6ccf5fb9,I39a308fb
* changes:
  Add a check for missing entries in AVB_FOOTER_ARGS_BY_PARTITION
  Add missing R partitions in AVB_FOOTER_ARGS
2021-03-04 19:19:40 +00:00
Bowgo Tsai
f85e68f554 Fix m bootimage_test_harness failure
Commit I66b57de91042bfd56ba54a3659843d8cf7873955 added the support
for different boot partition sizes but didn't consider the case of
building boot-test-harness.img. This CL fixes this by allowing
'boot-test-harness.img' as a boot image variant.

Bug: 181618515
Test: `m bootimage_test_harness` pass
Change-Id: I190d3bf26725ac54999758efbca66a94c5cd5c86
2021-03-04 14:41:16 +08:00
Petri Gynther
b10f7d2a9c Merge "Rename vendor-ramdisk to vendor_ramdisk" 2021-03-04 04:40:04 +00:00
Tianjie
bf0b8a8610 Add a check for missing entries in AVB_FOOTER_ARGS_BY_PARTITION
Fail the signing if the AVB_FOOTER_ARGS_BY_PARTITION isn't in sync
with common.AVB_PARTITIONS.

Bug: 181787095
Test: run sign_target_files_apks on a S image

Change-Id: I6ccf5fb9f39b92c1da2554f5b3826d2cd87d84d7
2021-03-03 17:31:48 -08:00
Tianjie
697c6eecf6 Add missing R partitions in AVB_FOOTER_ARGS
If we miss these entries, the signing script won't correctly update
the avb prop to build the vbmeta. This cl adds the missing partitions
for R build.

In the followup, we need to make the map in sync with AVB_PARTITIONS in
common.py

Bug: 181787095
Test: run sign_target_files_apks
Change-Id: I39a308fb7028b45ce08f0ca3c6ad61a6c13e8082
2021-03-03 15:28:58 -08:00
Brad Ebinger
35d002f9f5 Merge "Remove deprecated RcsService/PresencePolling apps" 2021-03-03 23:24:13 +00:00
Petri Gynther
dc24d88aa9 Rename vendor-ramdisk to vendor_ramdisk
Rename to get consistent ramdisk directory naming in
out/target/product/<name>:
  debug_ramdisk
  ramdisk
  vendor_debug_ramdisk
  vendor_ramdisk

Test: build and inspect out/target/product/<name>
Change-Id: I81d8f2cafe5e1b9024196cd74772b78d4a4aec58
2021-03-03 13:56:48 -08:00
Xin Li
2b1c89090f Merge "Merge RQ2A.210305.007" 2021-03-03 21:41:41 +00:00
Xin Li
b2ec711a7f Merge RQ2A.210305.007
Bug: 180401296
Merged-In: Ifc7f272e273f54df843650e7e74fcad40a76994a
Change-Id: I7a08adbca4a7f82be6e56c9ccb88b0ea7d5fc139
2021-03-03 09:12:01 -08:00
Martin Stjernholm
2344aacd02 Merge "Add a product variable to override APEX modules in boot jar lists." 2021-03-03 11:04:54 +00:00
Brad Ebinger
21bf64a70a Remove deprecated RcsService/PresencePolling apps
There is now an AOSP API for RCS UCE, removed the
deprecated RcsService/PresencePolling app targets.

Bug: 178489990
Test: make + inspect build
Merged-In: I0eaa321dfd75de8217c465a523d439ea702deea4
Change-Id: I0eaa321dfd75de8217c465a523d439ea702deea4
2021-03-03 00:47:38 +00:00
Martin Stjernholm
efe6a4d748 Add a product variable to override APEX modules in boot jar lists.
Test: m droid SOONG_CONFIG_art_module_source_build=false
      on internal branch
Bug: 180325915
Change-Id: I3ab64860fe4a60468ec8dad6517d1d67f72f13c7
2021-03-02 20:53:59 +00:00
Treehugger Robot
7e3f5430a8 Merge "Include android_soong_config_vars.mk in the make (kati) step." am: 36c1435ec4
Original change: https://android-review.googlesource.com/c/platform/build/+/1595337

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc7f272e273f54df843650e7e74fcad40a76994a
2021-03-02 19:58:45 +00:00
Treehugger Robot
f2507339e5 Merge "Fix typo in sysprop.mk and Changes.md" am: 1996d581d8
Original change: https://android-review.googlesource.com/c/platform/build/+/1612294

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaac0c7796e5ed0c91df42f14d1d23bf861e74ac0
2021-03-02 19:58:12 +00:00
Treehugger Robot
36c1435ec4 Merge "Include android_soong_config_vars.mk in the make (kati) step." 2021-03-02 09:20:37 +00:00
Treehugger Robot
1996d581d8 Merge "Fix typo in sysprop.mk and Changes.md" 2021-03-02 08:10:08 +00:00
Treehugger Robot
0fa0300013 Merge "Allow BOARD_VNDK_VERSION to be changed" am: 0181c7d33c
Original change: https://android-review.googlesource.com/c/platform/build/+/1608053

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1469d7db94532250ccded11a58f2fee99dea2c96
2021-03-02 02:05:12 +00:00
Treehugger Robot
afeb2bc404 Merge "Update m help text with guidance on parallelism" am: f3b8056189
Original change: https://android-review.googlesource.com/c/platform/build/+/1612064

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2c9de7523364d907232b038447e4aa07be3aa812
2021-03-02 02:04:36 +00:00
Treehugger Robot
0181c7d33c Merge "Allow BOARD_VNDK_VERSION to be changed" 2021-03-02 01:22:45 +00:00
Treehugger Robot
f3b8056189 Merge "Update m help text with guidance on parallelism" 2021-03-02 01:11:33 +00:00
TreeHugger Robot
0547bfd774 Merge "Merge RQ2A.210305.007 into stage." into stage-aosp-master 2021-03-02 01:09:06 +00:00
Donghyun Jo
8c65ef6574 Fix typo in sysprop.mk and Changes.md
android_info_pro -> android_info_prop
partititon -> partition
PRODUCT_SYSTEM_PROPERITES -> PRODUCT_SYSTEM_PROPERTIES

Test: build and manual test

Signed-off-by: Donghyun Jo <donghyun.jo@samsung.com>
Change-Id: I0b7f0566aaa5ce8844003bb4f373389c20ddeb88
2021-03-02 08:51:03 +09:00
Martin Stjernholm
786bbea407 Include android_soong_config_vars.mk in the make (kati) step.
Test: `m nothing` with https://r.android.com/1592872
Bug: 172480615
Change-Id: I960cd234a5dd607f4f5af6bb68ae15b9bd104e7a
2021-03-01 23:14:10 +00:00
Andrew Scull
2f8015f71a Merge "Add pvmfw partition to target files" am: 5553b5704c
Original change: https://android-review.googlesource.com/c/platform/build/+/1595341

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I83e3ecd8d6cf9847c38508ab088ccb66d193c7a7
2021-03-01 21:48:32 +00:00
Colin Cross
3fb7ddf3bc Update m help text with guidance on parallelism
Remove "-j" from the default recommended arguments and add a paragraph
describing the -j behavior.

Test: m help
Change-Id: Id5a5f4719f18ea2a9d09df43f5fb38592a59f5c9
2021-03-01 13:32:13 -08:00
Andrew Scull
5553b5704c Merge "Add pvmfw partition to target files" 2021-03-01 21:05:56 +00:00
Xin Li
3f904dd415 Merge RQ2A.210305.007 into stage.
Bug: 180401296
Merged-In: I6d6542306c51ac1682f02cbce6701688d2bdbea2
Change-Id: I1c3a82d5c420fbb97e81379034947d35024b0925
2021-03-01 00:54:23 -08:00
Xin Li
457b809bcc DO NOT MERGE - Mark RQ2A.210105.001 as merged.
Bug: 180401296
Merged-In: Iebf46f1a9a88da5ba403024f2bf1bcd44c4b52fc
Change-Id: I4a86e7513cb1aac30c431674427a658fe24ae374
2021-03-01 00:43:12 -08:00
Treehugger Robot
011aee1bc9 Merge "support pre-defined timestamp and uuid when bulid EROFS images" am: 0a4788c3fb
Original change: https://android-review.googlesource.com/c/platform/build/+/1595714

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebf46f1a9a88da5ba403024f2bf1bcd44c4b52fc
2021-03-01 07:25:30 +00:00
Treehugger Robot
0a4788c3fb Merge "support pre-defined timestamp and uuid when bulid EROFS images" 2021-03-01 06:29:49 +00:00
Joe Onorato
fe65f90925 Merge "Add dirmods command to envsetup.sh" am: 2599d32a40
Original change: https://android-review.googlesource.com/c/platform/build/+/1607836

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If8e1b50cabe45a9643ca22ac31a39f8905825ab0
2021-02-26 23:14:17 +00:00
Joe Onorato
2599d32a40 Merge "Add dirmods command to envsetup.sh" 2021-02-26 22:13:30 +00:00
Joe Onorato
2c1aa47057 Add dirmods command to envsetup.sh
It will query module-info.json for modules inside a given directory.

Test: . build/envsetup.sh ; dirmods frameworks/base
Change-Id: Iad3dcb038315f49c156764e34fb5f52ec3ad29be
2021-02-26 08:57:23 -08:00
Treehugger Robot
a2f416b884 Merge "Add spl-downgrade field to ota metadata" am: d33ae8363c
Original change: https://android-review.googlesource.com/c/platform/build/+/1583043

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifea124b3f84c18fedda16cbda12528628072666f
2021-02-25 23:31:44 +00:00
Treehugger Robot
d33ae8363c Merge "Add spl-downgrade field to ota metadata" 2021-02-25 22:51:26 +00:00
Kelvin Zhang
05ff7055b6 Add spl-downgrade field to ota metadata
In aosp/1581143 , we banned generation of SPL downgrade OTAs. However,
caller of OTA script can still force an SPL downgrade OTA by passing
--spl_downgrade flag. If this flag is specified, we propagate it to OTA
metadata so that GOTA server can properly honor this flag.

Test: th
Change-Id: Ic8cdc850d2210f4149ad9121fa4ed2e5a4f59bcc
2021-02-25 10:15:45 -05:00
Inseob Kim
6e7693f159 Allow BOARD_VNDK_VERSION to be changed
Some devices e.g. cuttlefish include BoardConfigMainlineCommon.mk.
This allows BOARD_VNDK_VERSION to be changed other than current, to
allow mixed build experiment with BOARD_VNDK_VERSION.

Test: try setting BOARD_VNDK_VERSION and get_build_var
Change-Id: I7eb7fe6527f24ee2a3b4af32194a48ca98146a78
2021-02-25 21:22:27 +09:00
Treehugger Robot
38cbde20c0 Merge "Add dependency from target-files.zip to rsync'd recovery ramdisk files" am: 0e0307b0a2
Original change: https://android-review.googlesource.com/c/platform/build/+/1606554

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3252e0bdce61ee240dd42d6a287705433956aa9a
2021-02-25 06:30:02 +00:00
Treehugger Robot
0e0307b0a2 Merge "Add dependency from target-files.zip to rsync'd recovery ramdisk files" 2021-02-25 06:03:01 +00:00
Treehugger Robot
b002cc3fbe Merge "releasetools: Fix an issue in common.GetSparseImage" am: 90c1763c0c
Original change: https://android-review.googlesource.com/c/platform/build/+/1602475

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I302dd296101733c794a8a11c6ce6713beb170678
2021-02-25 05:32:34 +00:00
Treehugger Robot
90c1763c0c Merge "releasetools: Fix an issue in common.GetSparseImage" 2021-02-25 05:05:42 +00:00
wangshumin
71af07abe8 releasetools: Fix an issue in common.GetSparseImage
Fix incorrect report "Failed to find the ZIP entry" error when
generate OTA package.

This happens when we have a file in ROOT which name contains 'system'
such as init.system_init.rc, and init.system_init.rc will be rename to
init.SYSTEM_init.rc incorrectly, so we failed to find the entry in ZIP.

Test: manual test
Change-Id: I97359e513aaca7521fe9c035f6a4264a2053b86d
Signed-off-by: wangshumin <wangshumin@xiaomi.com>
2021-02-25 09:34:57 +08:00
Colin Cross
e643120c75 Add dependency from target-files.zip to rsync'd recovery ramdisk files
target-files.zip may indirectly depend on the rsync'd recovery ramdisk
files when BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT is true.

Bug: 181095653
Test: manual
Change-Id: I673bb48b1fbb7a54455cda411f9444f05ddaa24f
2021-02-24 11:44:55 -08:00
Roman Kiryanov
3cc2b4c489 Merge "Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"" am: 52037cf027
Original change: https://android-review.googlesource.com/c/platform/build/+/1605133

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I8da24e1ac900c1ffb5e42d0ffa3aa5997aa03a6b
2021-02-24 18:27:04 +00:00
Roman Kiryanov
52037cf027 Merge "Revert "Set BUILD_BROKEN_VENDOR_PROPERTY_NAMESPACE for goldfish"" 2021-02-24 18:26:30 +00:00
Joe Onorato
2dba15bd2e Merge "ALLOW_RULES_IN_PRODUCT_CONFIG" am: 6af489099a
Original change: https://android-review.googlesource.com/c/platform/build/+/1598613

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id5d2194f8d3e8b9cd5f5d7499cd27041d5919d15
2021-02-24 18:26:11 +00:00
Joe Onorato
6af489099a Merge "ALLOW_RULES_IN_PRODUCT_CONFIG" 2021-02-24 17:43:37 +00:00
Devin Moore
93934ba177 Merge "Support vendor bootconfig creation" am: fd4f3c4c63
Original change: https://android-review.googlesource.com/c/platform/build/+/1579696

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7528a81e41df69cd932a40eaeeea7a1651f366b8
2021-02-24 16:40:07 +00:00
Devin Moore
fd4f3c4c63 Merge "Support vendor bootconfig creation" 2021-02-24 15:56:48 +00:00