Commit Graph

34149 Commits

Author SHA1 Message Date
Treehugger Robot
621e9cc599 Merge "Fix generic ramdisk build failures on dedicated recovery partitions" am: 2797146c86
Original change: https://android-review.googlesource.com/c/platform/build/+/2388833

Change-Id: Ia3fff9e16c204c846c1600c9cdcb83dc39bac027
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 20:24:56 +00:00
Treehugger Robot
82bac32195 Merge "Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS" am: 854afb6673 am: 71ca6b2e7a am: 5c89b167cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2391477

Change-Id: I81e862cb4c1ba70b0370bd21436de39d92c41de2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 20:09:36 +00:00
Treehugger Robot
2797146c86 Merge "Fix generic ramdisk build failures on dedicated recovery partitions" 2023-01-18 19:25:57 +00:00
Treehugger Robot
5c89b167cd Merge "Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS" am: 854afb6673 am: 71ca6b2e7a
Original change: https://android-review.googlesource.com/c/platform/build/+/2391477

Change-Id: I3ec5784c13351a33f7246523df9906ee3475418e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 19:08:37 +00:00
Treehugger Robot
71ca6b2e7a Merge "Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS" am: 854afb6673
Original change: https://android-review.googlesource.com/c/platform/build/+/2391477

Change-Id: I18847369e33509c73cb58e51db3e9f018434a7c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 18:36:22 +00:00
Treehugger Robot
854afb6673 Merge "Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS" 2023-01-18 18:07:07 +00:00
Treehugger Robot
21e0338f21 Merge "Resubmit: Initial add wvts to build" am: e473190d52 am: a7d2cc7d0a am: 6bb7a5916b
Original change: https://android-review.googlesource.com/c/platform/build/+/2383292

Change-Id: I8f4f788447baa1f52e49bb11dceeafd3a00f51d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 02:12:21 +00:00
Treehugger Robot
6bb7a5916b Merge "Resubmit: Initial add wvts to build" am: e473190d52 am: a7d2cc7d0a
Original change: https://android-review.googlesource.com/c/platform/build/+/2383292

Change-Id: Ifa4800ff0b53a87d9d2b8b137934fc69b7763ed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 01:34:34 +00:00
Treehugger Robot
a7d2cc7d0a Merge "Resubmit: Initial add wvts to build" am: e473190d52
Original change: https://android-review.googlesource.com/c/platform/build/+/2383292

Change-Id: I794fcf36ccf04291e51030dd16f947068c97fc8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-18 01:00:12 +00:00
Treehugger Robot
e473190d52 Merge "Resubmit: Initial add wvts to build" 2023-01-18 00:17:45 +00:00
Cole Faust
bd5eab8477 Remove usages of SOONG_MODULES_CFLAG_ARTIFACTS
No longer used.

Bug: 262629589
Test: m nothing
Change-Id: I3d9acf9fc3e205588161c9fb50fbe757f764d6bb
2023-01-17 15:38:33 -08:00
Android Build Coastguard Worker
b0a35c98fd Make change and version bump to TQ2A.230305.001
Merge cherrypicks of ['ag/20984664'] into tm-qpr2-release.

Change-Id: I2807ebe0b2cfad46f65d587ab520b225726c40ac
2023-01-17 20:21:33 +00:00
Steve Berbary
d7834084dd Update Security String to 2023-03-05
Bug: 265319238
Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
(cherry picked from commit 465700df39)
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
2023-01-17 20:07:54 +00:00
Kelvin Zhang
1143aaf772 Fix generic ramdisk build failures on dedicated recovery partitions
For targets with BoardUsesRecoveryAsBoot set to true, binaries in
generic_ramdisk are installed to $OUT/recovery/root/first_stage_ramdisk
This path is not on generic_ramdisk.mk 's allowlist, hence build fails.
To fix the failure, add $OUT/recovery/root/first_stage_ramdisk/system to
allow list.

Test: th, lunch eos-userdebug(a dedicated recovery partition target) and build.

Bug: 265477065
Change-Id: I89cf229adc028a7e5de632b9a3188ecb411de735
2023-01-17 17:11:55 +00:00
Steve Berbary
70228fd7d9 Update Security String to 2023-03-01 am: 663e449fbf am: 033863be25 am: c5f2b7f189
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984665

Change-Id: Idfc5ebb5c6ee90b6fe8c81d1d183e1c17b918ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 18:55:40 +00:00
Steve Berbary
c5f2b7f189 Update Security String to 2023-03-01 am: 663e449fbf am: 033863be25
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984665

Change-Id: I6d8deaaab9592f853e014210e16f8a09f5b673f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 18:21:20 +00:00
Steve Berbary
033863be25 Update Security String to 2023-03-01 am: 663e449fbf
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984665

Change-Id: Ic2de423da2f3efd97d10563a288c2167b270b906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 17:45:06 +00:00
Steve Berbary
bcacf0d47f Update Security String to 2023-03-01 am: 4904a80247 am: 3c38b0556d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984651

Change-Id: Id6a21f0631f556a422e55732558f317974ed3e8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 17:31:16 +00:00
Steve Berbary
c8fd0b22bc Update Security String to 2023-03-01 am: 4904a80247 am: 3c38b0556d
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984651

Change-Id: I0f9cd7f657392fd60b7d3378516341f5bc64f948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 17:30:37 +00:00
Steve Berbary
3c38b0556d Update Security String to 2023-03-01 am: 4904a80247
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984651

Change-Id: I2461f2a4f302a397f9c3bc5497b60e6442c67c6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 16:54:24 +00:00
Steve Berbary
834194d401 Update Security String to 2023-03-05 am: 465700df39 am: 39b3d42d74
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984664

Change-Id: I85276ae7f14d429d15aa46a3d51bd44f0c43a0e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 06:41:34 +00:00
Steve Berbary
39b3d42d74 Update Security String to 2023-03-05 am: 465700df39
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984664

Change-Id: Iba5261f5e598a7848d007e723e08b9299837b713
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 06:05:30 +00:00
Treehugger Robot
ecf2f2d30c Merge "Allow vendors to add custom vbmeta partitions" am: b80d9d6c33 am: b63987d351 am: 5d0d291fb0
Original change: https://android-review.googlesource.com/c/platform/build/+/2380861

Change-Id: Idd89b5377aed52cea0d775334387223f98dc2fa4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 03:32:59 +00:00
Treehugger Robot
5d0d291fb0 Merge "Allow vendors to add custom vbmeta partitions" am: b80d9d6c33 am: b63987d351
Original change: https://android-review.googlesource.com/c/platform/build/+/2380861

Change-Id: I4042684ef0171f8191b19a29b7695e988b31c552
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 02:38:57 +00:00
Treehugger Robot
b63987d351 Merge "Allow vendors to add custom vbmeta partitions" am: b80d9d6c33
Original change: https://android-review.googlesource.com/c/platform/build/+/2380861

Change-Id: Id38f4980039b9cefb9c0f3f5f215588ae59867b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-14 00:55:01 +00:00
Treehugger Robot
b80d9d6c33 Merge "Allow vendors to add custom vbmeta partitions" 2023-01-14 00:23:02 +00:00
Steve Berbary
663e449fbf Update Security String to 2023-03-01
Bug: 265319238

Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
2023-01-13 18:22:30 +00:00
Steve Berbary
4904a80247 Update Security String to 2023-03-01
Bug: 265319238

Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
2023-01-13 18:20:17 +00:00
Steve Berbary
465700df39 Update Security String to 2023-03-05
Bug: 265319238
Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
2023-01-13 18:18:04 +00:00
Shikha Panwar
d3bef475b2 Include initrd_bootconfig in the list of OTA tools
initrd_bootconfig is required for signing the virt apex & hence needs to
run outside the source tree as well.

Test: NA
Bug: 245277660
Change-Id: Id1776661e76a75cfb3cf530e7777dc4292522dd0
2023-01-13 08:28:44 +00:00
Xin Li
3e266be1a6 Merge "Merge tm-qpr-dev-plus-aosp-without-vendor@9467136" into stage-aosp-master 2023-01-13 07:32:57 +00:00
Android Build Coastguard Worker
c6a1548da9 Version bump to TQ2A.230109.003 [core/build_id.mk]
Change-Id: I97a46c5295638f06ef9001d0021b6ad3287eaca7
2023-01-13 03:02:59 +00:00
Kelvin Zhang
b81b4e3621 Allow vendors to add custom vbmeta partitions
Currently we only have vbmeta_system and vbmeta_vendor. Add
BOARD_AVB_VBMETA_CUSTOM_PARTITIONS , which allows OEMs to define
their own vbmeta_*.img partitions. example: aosp/2381823

Bug: 263568805
Change-Id: Id671e2c3aee9ada90256381cce432927df03169b
2023-01-12 17:34:42 -08:00
Vincent Donnefort
4a5fd836a1 Add null and console dev nodes to the Android initramfs
/dev/null is a security requirement for bionic, /dev/console is needed
so the kernel can set-up stdout stderr and stdin before running /init.

Bug: 254835242
Change-Id: I865856885e9957ea17e28b62273e701af9bfc56f
2023-01-12 11:25:14 +00:00
Jooyung Han
efc141fb12 Merge "vendor/etc/linker.config.pb from multiple input files" am: 8ee63e4ee8 am: 980e726aa8 am: cf119eb163
Original change: https://android-review.googlesource.com/c/platform/build/+/2379709

Change-Id: I52c64f1276960a06b69fb9e5ac59d17dac2b55c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 09:03:16 +00:00
Jooyung Han
cf119eb163 Merge "vendor/etc/linker.config.pb from multiple input files" am: 8ee63e4ee8 am: 980e726aa8
Original change: https://android-review.googlesource.com/c/platform/build/+/2379709

Change-Id: I988ee5f7f9a69852480eeee40198b8766de15aba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-12 08:23:59 +00:00
Xin Li
d8cc7f97ad Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
Bug: 264720040
Merged-In: Iea5b6fffed7c27855d87e35292f07a56686e4197
Change-Id: I912db6aac23dc5ee37b8b4455eec553da31d6dbc
2023-01-11 22:54:26 -08:00
Jooyung Han
8ee63e4ee8 Merge "vendor/etc/linker.config.pb from multiple input files" 2023-01-12 06:46:39 +00:00
Android Build Coastguard Worker
686a6957d5 Version bump to TQ2A.230109.002 [core/build_id.mk]
Change-Id: Ief26fe17debe7e51ad095d1783733a55ca858015
2023-01-11 20:52:22 +00:00
Robert Shih
1b73bfbd97 Resubmit: Initial add wvts to build
[ Merge of pa/2264578 ]

Test: make wvts

Bug: 209663123
Change-Id: If1382ed06a93bc34d327ee88bf46ff290e84f786
2023-01-11 00:55:50 +00:00
Dan Sinkiewicz
d475e99deb Merge "Revert "Initial add wvts to build"" am: e61203da9c am: 6946b25e3d am: 77e2b1d7dd
Original change: https://android-review.googlesource.com/c/platform/build/+/2382972

Change-Id: I9373282ac961c40f4b13536bc8c9d9548cba1e9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 20:58:45 +00:00
Robert Shih
9964162ae8 Merge "Initial add wvts to build" am: 0f8236bb24 am: 8d6ebee56b am: 1079601afa
Original change: https://android-review.googlesource.com/c/platform/build/+/2374652

Change-Id: I458176f4e3bfcc4e29b2fb8b99a96029540e07e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 20:56:52 +00:00
Dan Sinkiewicz
77e2b1d7dd Merge "Revert "Initial add wvts to build"" am: e61203da9c am: 6946b25e3d
Original change: https://android-review.googlesource.com/c/platform/build/+/2382972

Change-Id: I2d7d90e3034c88872326ffe5b2a6bf73ef408459
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 19:41:39 +00:00
Robert Shih
1079601afa Merge "Initial add wvts to build" am: 0f8236bb24 am: 8d6ebee56b
Original change: https://android-review.googlesource.com/c/platform/build/+/2374652

Change-Id: I0db5fd8bdd7eb47347a5414b69023d07836b0530
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 19:41:16 +00:00
Dan Sinkiewicz
e61203da9c Merge "Revert "Initial add wvts to build"" 2023-01-10 18:56:57 +00:00
Robert Shih
57fe3f6041 Revert "Initial add wvts to build"
This reverts commit 588f2e62da.

Reason for revert: b/265032293

Change-Id: I6a9dd24cfef2256288170f5bf59d24604f05d4d2
2023-01-10 18:51:18 +00:00
Robert Shih
0f8236bb24 Merge "Initial add wvts to build" 2023-01-10 18:27:26 +00:00
Jooyung Han
da2d4a29bf vendor/etc/linker.config.pb from multiple input files
When we have dedicated .mk files for each modules (e.g. usb, drm, etc)
and those modules have their own linker configuration requirements, it
would make more sense to have "fragments" for linker configuration.

This change introduces a new list variable to store the list of linker
configuration fragments. When it's set, vendor/etc/linker.config.pb is
generated from the list of input fragments.

Bug: 264330513
Test: set PRODUCT_VENDOR_LINKER_CONFIG_FRAGMENTS
Test: m vendorimage (generates vendor/etc/linker.config.pb)
Change-Id: I9eed0f90add0191885b7195efdab94b5b1a4a62d
2023-01-10 11:57:23 +09:00
Cole Faust
d31d1ecf0a Merge "Remove duplicates from VendorVars maps" am: 5065c690dd am: 00f730d9df am: 90274ea01d
Original change: https://android-review.googlesource.com/c/platform/build/+/2377826

Change-Id: If5f60acf36163bdd6c73e568e5d4dbcdd5b4670e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 01:39:01 +00:00
Cole Faust
90274ea01d Merge "Remove duplicates from VendorVars maps" am: 5065c690dd am: 00f730d9df
Original change: https://android-review.googlesource.com/c/platform/build/+/2377826

Change-Id: I6230ca8cf09c9814202bbe841b1192bbecf6ab90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-10 00:19:42 +00:00