Commit Graph

78677 Commits

Author SHA1 Message Date
Lucas Wei
035fdee0ef Merge "vendor_kernel_boot: Update releasetools for vendor_kernel_boot" am: 2d5ecef1b3 am: bd66e32393 am: b8b3c0d0ab
Original change: https://android-review.googlesource.com/c/platform/build/+/2064760

Change-Id: Ibcf742f858c37141ab59cbd2d9c589ae15cf6ada
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 04:48:40 +00:00
Lucas Wei
b8b3c0d0ab Merge "vendor_kernel_boot: Update releasetools for vendor_kernel_boot" am: 2d5ecef1b3 am: bd66e32393
Original change: https://android-review.googlesource.com/c/platform/build/+/2064760

Change-Id: I99a78c5ffa7b15bbb77d786b88b408fab81eded3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 04:29:44 +00:00
Lucas Wei
bd66e32393 Merge "vendor_kernel_boot: Update releasetools for vendor_kernel_boot" am: 2d5ecef1b3
Original change: https://android-review.googlesource.com/c/platform/build/+/2064760

Change-Id: Id07cc7552755a32503950c7e6e736a14b3baa366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 03:36:00 +00:00
Lucas Wei
2d5ecef1b3 Merge "vendor_kernel_boot: Update releasetools for vendor_kernel_boot" 2022-04-21 03:07:15 +00:00
Treehugger Robot
63ff2c20f7 Merge "Declare license metadata for copied files." am: d7856b74dc am: e1da8fe40b am: 75e70bef8b
Original change: https://android-review.googlesource.com/c/platform/build/+/2069492

Change-Id: I13a3ffed760f9a4fafa1062c38726070265940e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:58:57 +00:00
Treehugger Robot
75e70bef8b Merge "Declare license metadata for copied files." am: d7856b74dc am: e1da8fe40b
Original change: https://android-review.googlesource.com/c/platform/build/+/2069492

Change-Id: I8d1b2d6c0f8af8cc89de10bd989fbe6cf95a5623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:35:06 +00:00
Treehugger Robot
e1da8fe40b Merge "Declare license metadata for copied files." am: d7856b74dc
Original change: https://android-review.googlesource.com/c/platform/build/+/2069492

Change-Id: I70ce9aef9791a18081e989134eadfcb9d20ea5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-21 00:19:14 +00:00
Treehugger Robot
d7856b74dc Merge "Declare license metadata for copied files." 2022-04-20 23:58:24 +00:00
Ivan Lozano
7a9900a3ae Merge "rust: Add proc_macro NOTICE files" am: 6689f3889e am: 2f619a0787 am: 3dba55b9cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2067490

Change-Id: I46d86fd10c8265ce16c17110e67a94c276f5a9fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:19:20 +00:00
Treehugger Robot
df0327b8ad Merge "Add boot AVB key setting to GSI" am: f9fcd028df am: d02479f849 am: 7ab456ee2a
Original change: https://android-review.googlesource.com/c/platform/build/+/2068887

Change-Id: Ic62f5c94f4159e5442204ccc11d9aa1865d2d132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:18:43 +00:00
Steven Moreland
db20a629af Merge "Start script to finalize branch release." am: 7a396db029 am: 969dd0f48b am: 767a7d9cc3
Original change: https://android-review.googlesource.com/c/platform/build/+/2066080

Change-Id: I07605566e7e53d1de301eb8957ff5fe65504e251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:18:34 +00:00
Ivan Lozano
3dba55b9cd Merge "rust: Add proc_macro NOTICE files" am: 6689f3889e am: 2f619a0787
Original change: https://android-review.googlesource.com/c/platform/build/+/2067490

Change-Id: I222a9d507d31020ee33f3f519bf8b886c837243a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:03:20 +00:00
Treehugger Robot
7ab456ee2a Merge "Add boot AVB key setting to GSI" am: f9fcd028df am: d02479f849
Original change: https://android-review.googlesource.com/c/platform/build/+/2068887

Change-Id: I873031bb86a262812c097df724619ebd35cf794e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:02:54 +00:00
Steven Moreland
767a7d9cc3 Merge "Start script to finalize branch release." am: 7a396db029 am: 969dd0f48b
Original change: https://android-review.googlesource.com/c/platform/build/+/2066080

Change-Id: Ic9f9058e8630598f3111a43de0ab994c07365e62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:02:18 +00:00
Bob Badour
540a3f8ec1 Declare license metadata for copied files.
Bug: 151177513

Test: m droid dist reportmissinglicenses
Change-Id: Iada4a0ba3583f78e9419a5f487388b5e5eba195a
2022-04-20 13:01:35 -07:00
Ivan Lozano
2f619a0787 Merge "rust: Add proc_macro NOTICE files" am: 6689f3889e
Original change: https://android-review.googlesource.com/c/platform/build/+/2067490

Change-Id: Ica503d11bee5a8083e9138b90f912023f3510a2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:33:45 +00:00
Treehugger Robot
d02479f849 Merge "Add boot AVB key setting to GSI" am: f9fcd028df
Original change: https://android-review.googlesource.com/c/platform/build/+/2068887

Change-Id: I1483e2865bf8e82713103c7b976e5930fb4a23ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:32:59 +00:00
Steven Moreland
969dd0f48b Merge "Start script to finalize branch release." am: 7a396db029
Original change: https://android-review.googlesource.com/c/platform/build/+/2066080

Change-Id: I50ae4254cc64892a144bd126ec6d9f2c03a0a1ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:32:49 +00:00
Treehugger Robot
2763773a1a Merge "Allow init_rc files to be installed in ramdisk" am: 8a6fa9c7c5 am: 7137e03c4b am: abd53cb613
Original change: https://android-review.googlesource.com/c/platform/build/+/2064428

Change-Id: I677bde0d9c73f19a2631d2938c8826d949f1731b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 19:32:36 +00:00
Ivan Lozano
6689f3889e Merge "rust: Add proc_macro NOTICE files" 2022-04-20 19:21:25 +00:00
Treehugger Robot
abd53cb613 Merge "Allow init_rc files to be installed in ramdisk" am: 8a6fa9c7c5 am: 7137e03c4b
Original change: https://android-review.googlesource.com/c/platform/build/+/2064428

Change-Id: Iadc5b89a256454e009f886ffe34fcae335296f91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:56:36 +00:00
Treehugger Robot
f9fcd028df Merge "Add boot AVB key setting to GSI" 2022-04-20 18:55:53 +00:00
Steven Moreland
7a396db029 Merge "Start script to finalize branch release." 2022-04-20 18:45:26 +00:00
Treehugger Robot
7137e03c4b Merge "Allow init_rc files to be installed in ramdisk" am: 8a6fa9c7c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2064428

Change-Id: I916fe02c73158a4563c8e3ad6cc8f092a2015fde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 18:32:23 +00:00
Treehugger Robot
8a6fa9c7c5 Merge "Allow init_rc files to be installed in ramdisk" 2022-04-20 18:07:17 +00:00
Lucas Wei
03230250a3 vendor_kernel_boot: Update releasetools for vendor_kernel_boot
add_img_to_target_files.py will re-make image and build a new
signed vbmeta.img with new images in target-file.
We need to add vendor_kernel_boot into AVB signing list and make it
support that image.

Test: make dist -j110 and check vbmeta.img
Bug: 214409109
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: Id07433f3dc33f95e2edd49de890f1e098cb9ef31
2022-04-21 00:27:27 +08:00
Trevor Radcliffe
d3325d15ce Merge "Add comment for previous CL" am: 1e63a893dc am: 7cecfb7ffa am: eaaae159bc
Original change: https://android-review.googlesource.com/c/platform/build/+/2056045

Change-Id: Ia79235faba34f3f16fa84415dc8ac5d42cbd662b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 15:42:57 +00:00
Trevor Radcliffe
eaaae159bc Merge "Add comment for previous CL" am: 1e63a893dc am: 7cecfb7ffa
Original change: https://android-review.googlesource.com/c/platform/build/+/2056045

Change-Id: Iaecb70a18e68e9082d40d7debf129b7554cf391f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 15:18:09 +00:00
Trevor Radcliffe
7cecfb7ffa Merge "Add comment for previous CL" am: 1e63a893dc
Original change: https://android-review.googlesource.com/c/platform/build/+/2056045

Change-Id: I54647f88cee8a17d2b2aee5f58ec4de6a284e6bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 14:40:24 +00:00
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
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
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
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