tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
78686 commits 1 branch 0 tags 119 MiB
Commit graph

78686 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
e0013ca046 Merge "Revert "Create lists of projects to share per dist target"" am: f4ad50eeb6 am: 7b536df914 am: 10c3f0496b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2065621

Change-Id: I8a0377f718b43aae89e1ccf6066c590b57b99afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 18:23:54 +00:00
Cole Faust
a621980cbf Merge "Evaluate intermediate products properly" am: 90814c0706 am: 5ada12d182 am: 0144f19122 
Original change: https://android-review.googlesource.com/c/platform/build/+/2060370

Change-Id: I1089f71d09fa5c022d7f9312e4ad3a8c1cdaaffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 18:23:20 +00:00
Bob Badour
10c3f0496b Merge "Revert "Create lists of projects to share per dist target"" am: f4ad50eeb6 am: 7b536df914 
Original change: https://android-review.googlesource.com/c/platform/build/+/2065621

Change-Id: Ie3078798dfa46e30d102d0804b1c1ea8d4b3984e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 17:55:02 +00:00
Cole Faust
0144f19122 Merge "Evaluate intermediate products properly" am: 90814c0706 am: 5ada12d182 
Original change: https://android-review.googlesource.com/c/platform/build/+/2060370

Change-Id: I4dfaa4cd31e4ba5700e0c801f4997573c25db888
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 17:54:15 +00: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
6aae8cd480 Merge "Package vts kernel tests in general-tests.zip" am: 52cf004a37 am: 658d2a7c1f am: bdee7c8512 
Original change: https://android-review.googlesource.com/c/platform/build/+/2062947

Change-Id: If102739b08e5a02e7202f0a1d22561b1ceb0723c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 05:47:45 +00:00
Treehugger Robot
6067d6f37c Merge "Non-module targets." am: 03ea8842af am: d13457d943 am: 4b209efdf0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2063381

Change-Id: Iae1b0b592be3bf8166ca6d944695624f2a6712f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 05:47:36 +00:00
Dan Shi
bdee7c8512 Merge "Package vts kernel tests in general-tests.zip" am: 52cf004a37 am: 658d2a7c1f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2062947

Change-Id: I16a9b5458d980279fb3883a14c9e80432e21c7dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 05:32:10 +00:00
Treehugger Robot
4b209efdf0 Merge "Non-module targets." am: 03ea8842af am: d13457d943 
Original change: https://android-review.googlesource.com/c/platform/build/+/2063381

Change-Id: I9d01f4999b19e7a7ff3dacfb5a6eb11afb763cde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-04-15 05:32:01 +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