Trevor Radcliffe
1e63a893dc
Merge "Add comment for previous CL"
2022-04-20 14:16:22 +00:00
SzuWei Lin
97064c53ff
Add boot AVB key setting to GSI
...
Signing tool assumes GSI targets has boot.img and get error without
these settings.
Bug: 229814765
Change-Id: I1e8e7f6375e396e1c2feb858b97e7d27dc5a2dec
2022-04-20 07:20:45 +00:00
Treehugger Robot
fcae811f2c
Merge "Correct abspath implementation" am: 9ec1a7aa72
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2068367
Change-Id: Id0156874a096036a515913c13406cef823f148d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:48:43 +00:00
Treehugger Robot
188e38ecd4
Merge "Sort inherited products correctly" am: 0339142a27
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2066079
Change-Id: I174012ee8ba083b825825b8b0f616c3f7eb2413d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-20 01:48:33 +00:00
Treehugger Robot
9ec1a7aa72
Merge "Correct abspath implementation"
2022-04-20 01:32:16 +00:00
Treehugger Robot
0339142a27
Merge "Sort inherited products correctly"
2022-04-20 01:09:36 +00:00
Steven Moreland
3549659a1c
Start script to finalize branch release.
...
To put in CI. At the end of every Android release, we need
to do 100,000 things to get the release ready. The process
to finalize the release for AIDL interfaces is automated now,
so we're adding a generic script. The goal is:
1. gradually add more pieces of the finalization process
which can be automated (VNDK, SDK, etc...)
2. when problems happen, we can fix them in real time in CI
3. once the entire release process is in CI, we can optimize
it, and we can require that new requirements on the
Android release process come with a script to satisfy them.
Until then, this script will be used to test the automated parts
of the release process in CI.
Bug: 190577319
Bug: 228979367
Test: ./build/make/finalize_branch_for_release.sh (in the T release branch)
Change-Id: Ie9ff42dd4c6e86d395bde3f14788029e5bde5fb2
2022-04-19 23:47:08 +00:00
Cole Faust
426c7441b0
Correct abspath implementation
...
realpath doesn't return a path if the file doesn't exist,
but $(abspath) in make does.
Bug: 229132189
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: Ief7f634024cc52a9e8c5e478666b15512512f0d8
2022-04-19 14:46:09 -07:00
Colin Cross
b8999c3d88
Merge "Put javac, d8 and r8 rules into RBE ninja pool, take two" am: 845e23b0de
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2065912
Change-Id: I42de27dd63ccccad7255da0422d9194a510c0f45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 21:11:05 +00:00
Colin Cross
845e23b0de
Merge "Put javac, d8 and r8 rules into RBE ninja pool, take two"
2022-04-19 20:52:39 +00:00
Iavor-Valentin Iftime
40adb17a1c
Rebuild and copy recovery and boot img when using vendor_otatools
...
Rebuild recovery and boot images with vbmeta footers and copy together with recovery patch/install files when building vendor images using vendor otatools. Fixes validate_target_files failure.
Bug: 220126689
Bug: 186097910
Test: sign_target_files_apks \
--vendor_otatools=otatools_vendor_dir \
--vendor_partitions=vendor,odm \
merged-target_files.zip \
signed-target_files.zip
Test: validate_target_files signed-target_files.zip
Change-Id: Id45c67405bc37b769757db1701507f82cc6068d3
2022-04-19 18:35:36 +00:00
Treehugger Robot
fa33ae6ff8
Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" am: 95654c5113
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064761
Change-Id: I6437f6be96ed0013dc6e8cbc0bda018fa6ca3574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-19 16:39:15 +00:00
Treehugger Robot
95654c5113
Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK"
2022-04-19 16:17:38 +00:00
Bowgo Tsai
85578e0a9d
Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK
...
GKI targets, e.g., `gki_arm64` or `gki_x86_64` have only
boot-*.img files without a ramdisk. It has no other images,
e.g., init_boot.img, system.img, etc.
The current build system assumes that the ramdisk is either
in a boot.img or in a init_boot.img, which is not true for
those GKI targets. Adding a new flag to support building
boot-*.img without a ramdisk while not building an init_boot.img.
Bug: 220834917
Test: build and `unpack_bootimg`
Change-Id: I789343c3e3d9ff0c36c0e19680a9792bd31a1c9f
2022-04-19 17:57:51 +08:00
Cole Faust
d370a3f7bd
Sort inherited products correctly
...
We pass the filename without the extension to
rblf.inherit(). Removing the extension changes the
sort order when one file's name is a prefix of another:
```
>>> sorted(["base", "base-secondary"])
['base', 'base-secondary']
>>> sorted(["base.mk", "base-secondary.mk"])
['base-secondary.mk', 'base.mk']
```
Correct the sort order so that global variables get
their correct ordering.
Bug: 229132189
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I22367eb49b33956b71ac1b966fe78c1308b94257
2022-04-18 17:18:08 -07:00
Xin Li
959692ce64
Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master
2022-04-18 23:39:47 +00:00
Cole Faust
bc0c150831
Merge "Implement abspath" am: a9aa002d3b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2065554
Change-Id: I1d3870beed4989bc3cc1fa3671c9f5cdb2169b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-18 21:44:24 +00:00
Cole Faust
a9aa002d3b
Merge "Implement abspath"
2022-04-18 21:26:40 +00:00
Xin Li
fc75ee3331
Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047
...
Bug: 226662282
Merged-In: I4ba36a79abd13c42b986e3ba0d6d599c1cc73cb0
Change-Id: Ib78e46b46934800a767685a8d91e8929fe0cf686
2022-04-18 21:04:36 +00:00
Colin Cross
85722b807a
Put javac, d8 and r8 rules into RBE ninja pool, take two
...
I60f7859f3657fc1eff0daf0e0a1b0f9fe63551b6 attempted to put the javac,
d8 and r8 rules into the RBE ninja pool so they could run 500 jobs
in parallel, but rbe.mk is not parsed during the main build phase
and the pool continued to be unset. Move the pool configuration
into config.mk.
Bug: 228603472
Test: manual
Change-Id: I56377244e1c496034576ba5988393d88c2c5b09f
2022-04-18 12:10:33 -07:00
Ivan Lozano
5880e85a0f
rust: Add proc_macro NOTICE files
...
Collect NOTICE files from proc-macros in a similar fashion to static
libraries.
Test: m
Change-Id: Id8ef8d74c8e0ea6ce3c137231b41addcb763876d
2022-04-18 15:03:37 -04:00
Sam Saccone
d03bb4ff75
Merge "Do not compress zip file for unit tests." am: 6337ed39e1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064641
Change-Id: Iba30f601a609a734d48e7aabe18923782706494d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 21:36:17 +00:00
Sam Saccone
6337ed39e1
Merge "Do not compress zip file for unit tests."
2022-04-16 21:13:00 +00:00
Treehugger Robot
05c690dd2e
Merge "Add build flags for legacy EROFS support." am: 80d2c8f7a7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2009556
Change-Id: I65b39ed4ad81db9c6a0c222f5d3eaadd3ee33356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-16 05:26:20 +00:00
Treehugger Robot
80d2c8f7a7
Merge "Add build flags for legacy EROFS support."
2022-04-16 05:10:04 +00:00
Sam Saccone
a24c755f66
Do not compress zip file for unit tests.
...
BUG=229404699
Change-Id: I91df8973b9308cd3fa572d7afe1e9e4ec8a9af39
2022-04-15 23:50:12 +00:00
Cole Faust
0488f3da5b
Implement abspath
...
This is to minimize the differences between the make
and starlark product configs for the quick ci test.
Bug: 229132189
Test: Manually
Change-Id: I3286ba64e9d8fc9d1b169a7ed18f5a565a117a8d
2022-04-15 15:05:03 -07:00
Bob Badour
7b536df914
Merge "Revert "Create lists of projects to share per dist target"" am: f4ad50eeb6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2065621
Change-Id: Ie32c16a8e02aa5020103aa0ab5c0d680baa2233c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 17:32:56 +00:00
Cole Faust
5ada12d182
Merge "Evaluate intermediate products properly" am: 90814c0706
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2060370
Change-Id: If29eead358927e45159e8b843026eeded1fdc033
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 17:32:43 +00:00
Bob Badour
f4ad50eeb6
Merge "Revert "Create lists of projects to share per dist target""
2022-04-15 17:31:03 +00:00
Bob Badour
59e4951021
Revert "Create lists of projects to share per dist target"
...
This reverts commit 1fd4bda634
.
Reason for revert: Causes flaky build breakages
Bug: 229319921
Change-Id: I82e660e95c8d4d72b88d2de58d82e0d4be901869
2022-04-15 17:29:26 +00:00
Kelvin Zhang
701f161eb6
Allow init_rc files to be installed in ramdisk
...
Test: th
Test: m target-file-package, then check INIT_BOOT dir of target file,
make sure snapuserd.rc is there
Bug: 219841787
Bug: 228893064
Change-Id: Iac3f219c763fbf8acd17f0339089c7576974dc05
2022-04-15 10:17:18 -07:00
Cole Faust
90814c0706
Merge "Evaluate intermediate products properly"
2022-04-15 17:11:55 +00:00
Dan Shi
658d2a7c1f
Merge "Package vts kernel tests in general-tests.zip" am: 52cf004a37
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2062947
Change-Id: I316f60c3845c2b7512f923ac184cb4f3934880fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 05:14:02 +00:00
Treehugger Robot
d13457d943
Merge "Non-module targets." am: 03ea8842af
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2063381
Change-Id: I9d18ff679e7de22195a43063f1e184a17d600f0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-15 05:13:52 +00:00
Dan Shi
52cf004a37
Merge "Package vts kernel tests in general-tests.zip"
2022-04-15 05:03:20 +00:00
Treehugger Robot
03ea8842af
Merge "Non-module targets."
2022-04-15 04:41:23 +00:00
Bob Badour
5acd436645
Non-module targets.
...
Bug: 151177513
Bug: 213388645
Bug: 210912771
Test: m droid dist reportmissinglicenses
Change-Id: I897cf0e6f875ce2d370772405f31cc94b999ef19
2022-04-14 17:59:01 -07:00
Treehugger Robot
8a4f747caf
Merge "Create lists of projects to share per dist target" am: 746806b3bb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064290
Change-Id: Ib35ef1c1a8da7d81ce63aede3bc36d6ff99f7597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 22:27:39 +00:00
Treehugger Robot
4a2f1f84d0
Merge "Rename listshare and checkshare." am: e487fa3ccb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2063382
Change-Id: Iaeb6cea374eed9bd4a168da50701734255d6a6e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 22:26:32 +00:00
Treehugger Robot
664fd353b1
Merge "Non-module targets." am: fc0dcc1bc1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2063380
Change-Id: Ia5b028d82cf1625f7dad1f26c84b069026d2ddbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 22:25:51 +00:00
Treehugger Robot
746806b3bb
Merge "Create lists of projects to share per dist target"
2022-04-14 22:09:19 +00:00
Treehugger Robot
e487fa3ccb
Merge "Rename listshare and checkshare."
2022-04-14 22:09:15 +00:00
Treehugger Robot
fc0dcc1bc1
Merge "Non-module targets."
2022-04-14 22:02:53 +00:00
Cole Faust
2c90bc41c8
Merge "Allow setting PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to false" am: 95601112d5
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2061701
Change-Id: I52e14079ac1f8c7592361b8818643317aeb11e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:39:42 +00:00
Cole Faust
547767afb8
Merge changes from topic "colefaust_enforce_product_packages_exist" am: 1be3bddbfa
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2063512
Change-Id: I3d98fec7c04e8e846821eedcc0ab495055ba79dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:38:45 +00:00
Cole Faust
414100caeb
Optionally dump RBC variables at the end of config.mk am: ec8316de2e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2063509
Change-Id: Ia4f6119c1f325cf26198891d9d17fc26c63cc7f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:38:44 +00:00
Cole Faust
85f941cf3a
Merge "Remove usages of long-form variables" am: b760b469c7
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064287
Change-Id: I981c3dc7abf4d3508d06ba19bbdbadaa2107327d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-04-14 17:38:15 +00:00
Cole Faust
95601112d5
Merge "Allow setting PRODUCT_ENFORCE_ARTIFACT_PATH_REQUIREMENTS to false"
2022-04-14 16:57:39 +00:00
Cole Faust
1be3bddbfa
Merge changes from topic "colefaust_enforce_product_packages_exist"
...
* changes:
Implement enforce_product_packages_exist
Optionally dump RBC variables at the end of config.mk
2022-04-14 16:56:28 +00:00