Commit Graph

75894 Commits

Author SHA1 Message Date
Steven Moreland
e95beadd9a sdk finalization script OWNERS smoreland@
Bug: 190577319
Test: N/A
Change-Id: I05e9f88deb6640f944145f00932405dea8e6b195
2022-04-22 22:08:34 +00:00
Treehugger Robot
5f6235e580 Merge "Expand KNOWN_CODENAMES to cover all entries in Build.VERSION_CODES." 2022-04-22 19:52:05 +00:00
satayev
e0a44065b1 Expand KNOWN_CODENAMES to cover all entries in Build.VERSION_CODES.
Bug: 220153433
Test: atest BuildTest
Change-Id: I24d73a846d14a032c1e03679cef10cfeac814bb9
Merged-In: I24d73a846d14a032c1e03679cef10cfeac814bb9
(cherry picked from commit da1e41d1f3)
2022-04-22 09:14:48 -07:00
Treehugger Robot
185a226bd5 Merge "finalize_branch_for_release.sh rel to root" 2022-04-22 03:07:24 +00:00
Treehugger Robot
8ecc6369f0 Merge "Use the new R8/D8_FLAGS vars" 2022-04-22 02:42:06 +00:00
Treehugger Robot
5b945cb354 Merge "Add owners for version_defaults.mk" 2022-04-21 23:58:04 +00:00
Steven Moreland
12071ac571 finalize_branch_for_release.sh rel to root
Bug: 228979367
Test: run script from root
Change-Id: I0a5cfd4873ccf49fd53be745d61005e821bfa80d
2022-04-21 22:43:54 +00:00
Jared Duke
1410f684f6 Use the new R8/D8_FLAGS vars
Propagate the new D8/R8 JVM flags vars that were formerly combined in
DEX_FLAGS.

Bug: 205303544
Test: time m
Change-Id: Ifc6051cd9422b3f5c52322833d9a7f5e8263f857
2022-04-21 18:24:55 +00:00
Iavor-Valentin Iftime
71585eae2b Merge "Rebuild and copy recovery and boot img when using vendor_otatools" 2022-04-21 16:07:12 +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
d7856b74dc Merge "Declare license metadata for copied files." 2022-04-20 23:58:24 +00:00
Bassem Khalife
5dc6b582be Add owners for version_defaults.mk
Adding members of the RelPgM team to fast track monthly Security SPL update approval

Bug: 219813826
Change-Id: I038e0c7aea6d1aefe5b847978838952fa653d11b
2022-04-20 22:09:56 +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
6689f3889e Merge "rust: Add proc_macro NOTICE files" 2022-04-20 19:21:25 +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
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
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
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
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
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
Cole Faust
a9aa002d3b Merge "Implement abspath" 2022-04-18 21:26:40 +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
6337ed39e1 Merge "Do not compress zip file for unit tests." 2022-04-16 21:13:00 +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
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
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
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
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
Cole Faust
b760b469c7 Merge "Remove usages of long-form variables" 2022-04-14 16:55:18 +00:00
Cole Faust
81f1e92ed8 Remove usages of long-form variables
The long-form variables (PRODUCTS.<makefile>.<variable>)
are used to get information about multiple products.
However, they've never really worked correctly, and so
importing multiple products is deprecated behavior.

Remove as many usages of the long-form variables and
multi-product imports as possible.

Bug: 228518445
Test: Manually
Change-Id: I0b67f16360ff8bdcdb39638de739440472bccf76
2022-04-13 15:49:56 -07:00