Treehugger Robot
9f99087283
Merge "Correct abspath implementation" am: 9ec1a7aa72
am: fcae811f2c
am: 3033cc5982
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2068367
Change-Id: Ie2fac8474be0853fca2820f9e38f90cb91412216
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:24:35 +00:00
Treehugger Robot
f585c50d8e
Merge "Sort inherited products correctly" am: 0339142a27
am: 188e38ecd4
am: 8444f7fddf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2066079
Change-Id: If2785c4848682aca5dbc2dea7c37793434119cc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:23:03 +00:00
Colin Cross
bc28181e3d
Merge "Put javac, d8 and r8 rules into RBE ninja pool, take two" am: 845e23b0de
am: b8999c3d88
am: 1e492a67d2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2065912
Change-Id: I47ac1a65c04c32666535e20c44f989921e013577
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:21:19 +00:00
Treehugger Robot
7ec455ad93
Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" am: 95654c5113
am: fa33ae6ff8
am: 1a73e98758
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064761
Change-Id: I1e8ff054b8a9946bacf605f7565bbbc7941badeb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 06:03:43 +00:00
Xin Li
1ac3476db9
[automerger skipped] Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master am: 959692ce64
-s ours am: 6d288f3411
-s ours
...
am skip reason: Merged-In I4ba36a79abd13c42b986e3ba0d6d599c1cc73cb0 with SHA-1 824608c33d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17805725
Change-Id: Ic2003b3ad0415e6103f69e073c61ea05f61e5e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 04:48:00 +00:00
Xin Li
596f8947c5
[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: fc75ee3331
-s ours am: 91d612a73b
-s ours
...
am skip reason: Merged-In I4ba36a79abd13c42b986e3ba0d6d599c1cc73cb0 with SHA-1 824608c33d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17805725
Change-Id: Ib2f0ba87c60358cd8037f2a0fc216c5c9e11af97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 04:47:32 +00:00
Treehugger Robot
3033cc5982
Merge "Correct abspath implementation" am: 9ec1a7aa72
am: fcae811f2c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2068367
Change-Id: Ifa14038d168b893001b453da41f3c4d83e8c6df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 02:07:51 +00:00
Treehugger Robot
8444f7fddf
Merge "Sort inherited products correctly" am: 0339142a27
am: 188e38ecd4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2066079
Change-Id: Ie7c7dcdf981dd04e573cef42aea1a7c0f1066fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 02:07:42 +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
Android Build Coastguard Worker
2f394f0112
Make change and version bump to TP1A.220420.001
...
Change-Id: I4464dc0b8b7e18638522e0aa122bcf1881a8d32b
2022-04-20 01:20:55 +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
Colin Cross
1e492a67d2
Merge "Put javac, d8 and r8 rules into RBE ninja pool, take two" am: 845e23b0de
am: b8999c3d88
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2065912
Change-Id: I59452bfd60967db2cc8a7e097e044b90f5479e3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 21:49:54 +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
1a73e98758
Merge "Adding BOARD_BUILD_GKI_BOOT_IMAGE_WITHOUT_RAMDISK" am: 95654c5113
am: fa33ae6ff8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064761
Change-Id: If7455d464bdbaeb8917704678e7d23c7a9ca7583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 17:04:55 +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
Android Build Coastguard Worker
0961df227b
Make change and version bump to TP1A.220419.001
...
Change-Id: Id71dff5123faaeadf34349124083dbeb8957606a
2022-04-19 01:27:38 +00: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
6d288f3411
[automerger skipped] Merge "Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047" into stage-aosp-master am: 959692ce64
-s ours
...
am skip reason: Merged-In I4ba36a79abd13c42b986e3ba0d6d599c1cc73cb0 with SHA-1 824608c33d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17805725
Change-Id: Id8a63ea4ccb1574797c32c21d0225b78b0e056d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:08:41 +00:00
Xin Li
91d612a73b
[automerger skipped] Empty merge of sc-v2-dev-plus-aosp-without-vendor@8433047 am: fc75ee3331
-s ours
...
am skip reason: Merged-In I4ba36a79abd13c42b986e3ba0d6d599c1cc73cb0 with SHA-1 824608c33d
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/17805725
Change-Id: I02469519737718be6063f2fdd679a7242ff6c0b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-19 00:08:15 +00: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
401af25546
Merge "Implement abspath" am: a9aa002d3b
am: bc0c150831
am: a6ea980936
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2065554
Change-Id: I9aefb9269330f3e7196e3501ec90acaff029955f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 22:35:00 +00:00
Cole Faust
a6ea980936
Merge "Implement abspath" am: a9aa002d3b
am: bc0c150831
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2065554
Change-Id: Ib32425125c2e6554fbf36f1496047d89e912b5a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-18 22:14:13 +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
Android Build Coastguard Worker
6833640243
Make change and version bump to TP1A.220418.001
...
Change-Id: Ib02f2971bdaaf804ca5f883ccea2843dbd2230ec
2022-04-17 23:20:30 +00:00
Android Build Coastguard Worker
187d517205
Make change and version bump to TP1A.220417.001
...
Change-Id: Ia635295007250897d819f9f2214db775d17b9848
2022-04-16 23:20:10 +00:00
Sam Saccone
70dbe365fd
Merge "Do not compress zip file for unit tests." am: 6337ed39e1
am: d03bb4ff75
am: cc8ad353fd
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064641
Change-Id: I5164683cbc32a2b597e0f87d5c63af38789b1aec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 22:32:57 +00:00
Sam Saccone
cc8ad353fd
Merge "Do not compress zip file for unit tests." am: 6337ed39e1
am: d03bb4ff75
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2064641
Change-Id: I986e79ae1701dec4df99b1d87096c41e9bc3b650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 22:13:44 +00: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
f1efdd1877
Merge "Add build flags for legacy EROFS support." am: 80d2c8f7a7
am: 05c690dd2e
am: 2d16d3be49
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2009556
Change-Id: Iffa5eaf98453601e7edf7f012c28bcb1438193f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 06:15:22 +00:00
Treehugger Robot
2d16d3be49
Merge "Add build flags for legacy EROFS support." am: 80d2c8f7a7
am: 05c690dd2e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2009556
Change-Id: I9bc47f646091562fefdde6163ca16e28c4235f5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-16 05:57:02 +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
Android Build Coastguard Worker
fa5185146c
Make change and version bump to TP1A.220416.001
...
Change-Id: I277e8d25eb2ee1c3bedc8fd412febc7db52de7ef
2022-04-16 03:20:06 +00:00
Android Build Coastguard Worker
5b9ae52537
Version bump to TP1A.220415.003 [core/build_id.mk]
...
Change-Id: Ie8a4157f32d490cb90b16509fea6083ab061b7d4
2022-04-16 00:49:05 +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
Android Build Coastguard Worker
b667103464
Version bump to TP1A.220415.002 [core/build_id.mk]
...
Change-Id: Id1af74a142c75b0d4fe926ebf64b0578769ef4d1
2022-04-15 19:19:16 +00:00