Commit Graph

35577 Commits

Author SHA1 Message Date
Daniel Zheng
ba67aa4aee remove --apply-vbmeta from vbmeta_vendor
Removing this flag as --apply-vbmeta should only be used for root vbmeta
partitions.

Test: m fastboot_info, fastboot flashall
Bug: 299440104
Change-Id: I4910008635b16c4f4194ebd45da26bd1a8875fc1
2023-09-12 09:43:09 -07:00
Alice Wang
a8bbb12336 Merge "[avf] Add build-time flag for pVM remote attestation" into main am: 4f4f965f38
Original change: https://android-review.googlesource.com/c/platform/build/+/2745403

Change-Id: Ia85cf199ef6b565ab82a5f50dba5b04dbbca637f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 08:49:26 +00:00
Alice Wang
4f4f965f38 Merge "[avf] Add build-time flag for pVM remote attestation" into main 2023-09-12 07:55:50 +00:00
Jooyung Han
3b80ef8f49 Merge "Run apex_sepolicy_tests for all installed APEXes" into main am: f3c3f40c3b
Original change: https://android-review.googlesource.com/c/platform/build/+/2745257

Change-Id: I9f0ae655a6b817aabbcd2dc83b757fef08b82f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 22:59:02 +00:00
Jooyung Han
f3c3f40c3b Merge "Run apex_sepolicy_tests for all installed APEXes" into main 2023-09-11 22:30:20 +00:00
Cole Faust
ab7ddf8f20 Merge "Clean staging dirs in build_image.py" into main am: 548775d247
Original change: https://android-review.googlesource.com/c/platform/build/+/2746998

Change-Id: I6f1b97ba49fe1bb083ec9d520b5955bbd8580efe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:07:50 +00:00
Yu Liu
d793c271c3 Support aconfig_declarations, aconfig_values and aconfig_value_set
Bug: 297356603
Test: Unit tests
Change-Id: Iefa0e056cd6185499ffa92492b261c31a5d27af2
2023-09-11 10:57:16 -07:00
Cole Faust
548775d247 Merge "Clean staging dirs in build_image.py" into main 2023-09-11 17:25:19 +00:00
Gurpreet Singh
7f5607474c Merge "Add OWNERS for sdk extensions version updates" into main am: a2d9728449
Original change: https://android-review.googlesource.com/c/platform/build/+/2743417

Change-Id: Ie6516b5212459c52090dba9b88c1989644585bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 14:53:59 +00:00
Gurpreet Singh
a2d9728449 Merge "Add OWNERS for sdk extensions version updates" into main 2023-09-11 14:30:11 +00:00
Alice Wang
8d9b3c5d3c [avf] Add build-time flag for pVM remote attestation
Bug: 299604057
Test: m
Change-Id: Iaa1d1934ca05f2fe6d5e1b55a81caa051813e5b5
2023-09-11 07:15:57 +00:00
Jooyung Han
e78ad74b2b Run apex_sepolicy_tests for all installed APEXes
This is to check if unknown file context labels are used in APEX. The
reason why this is done in Makefile is to cover vendor-specific SE
policy and prebuilt APEXes. Note that there's already a validation check
when building APEXes (in Soong), which only checks the generic rules,
not vendor-specific.

Bug: 299391194
Test: atest apex_sepolicy_tests_test
Test: m
Change-Id: I4378b7530e8433d2bf188db95cb5bf791e3bf778
2023-09-11 13:40:52 +09:00
Cole Faust
152cdfab7c Clean staging dirs in build_image.py
build_image.py now accepts a --input-directory-filter-file argument
that contains a list of files to consider from the input directory.
A new, temporary input directory will be created, and only the
considered files will be copied to it.

This removes most of the need for `m installclean`, as old files or
files built manually will no longer end up on the partition.

Bug: 205632228
Test: Presubmits
Change-Id: I07e0bf8e840abf0b51a2fdf67b758905fb3c5b5b
2023-09-08 16:24:26 -07:00
Treehugger Robot
237fb6585b Merge "Add a build-time flag for LLPVM Changes in AVF" into main am: 79955070f3
Original change: https://android-review.googlesource.com/c/platform/build/+/2745401

Change-Id: I7b82c0f78658cc059e27332c5f100f493b09c94d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 17:18:30 +00:00
Shikha Panwar
32bd6bdd1a Add a build-time flag for LLPVM Changes in AVF
Bug: 278067832
Test: Builds
Change-Id: I25560797e3a0c71a263135ade0d8689ec92cb177
2023-09-08 14:29:00 +00:00
Gurpreet Singh
3b3e686d8b Add OWNERS for sdk extensions version updates
Our team performs the mainline sdk releases and has to update the sdk
extensions version on every release.

Adding people who are involved in the sdk ext release process so that
changes related to sdk extensions version updates can be approved by
our team.

We will only be approving changes which updates sdk extensions version.

Bug: N/A
Test: N/A
Change-Id: I42755dbae7054161f56e789b57e064084eebc7c7
2023-09-08 13:30:10 +00:00
Alan Stokes
fab1d5bf4e Merge "Add a build-time flag for DICE Changes in AVF" into main am: 7d63a84642
Original change: https://android-review.googlesource.com/c/platform/build/+/2744058

Change-Id: I58f4994a4d5ff901b998a9cc9376c25e523b1e96
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 12:31:27 +00:00
Alan Stokes
7d63a84642 Merge "Add a build-time flag for DICE Changes in AVF" into main 2023-09-08 12:21:41 +00:00
Firman Prayoga
e4a3296f1d Merge "Revert "Clean staging dirs in build_image.py"" into main am: 44d86b138b
Original change: https://android-review.googlesource.com/c/platform/build/+/2746515

Change-Id: Ibe31fc87779099b74bb20625ce1ee931907d0708
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 04:31:46 +00:00
Firman Prayoga
44d86b138b Merge "Revert "Clean staging dirs in build_image.py"" into main 2023-09-08 04:06:57 +00:00
Firman Prayoga
df21706765 Revert "Clean staging dirs in build_image.py"
Revert submission 2736954-proper_installclean

Reason for revert: Potential culprit for build breakage b/299545346

Reverted changes: /q/submissionid:2736954-proper_installclean

Change-Id: I2b0671bd40b7a74ef02923a777ec899401691454
2023-09-08 01:24:45 +00:00
Cole Faust
686b624b0c Merge changes I1cfdc6f4,I22c91c79 into main am: 420f6978ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2708830

Change-Id: I9c41a2ada49e96571b4b74cce68efd28d877cf29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 21:19:53 +00:00
Cole Faust
8a7efafe50 Validate release config with a schema
To more thouroughly check that it's valid.

Test: m nothing
Change-Id: I1cfdc6f4d20e826eb870f5e1e71d0386c589bc9a
2023-09-07 12:32:39 -07:00
Cole Faust
0c869edcd1 Make release_config.bzl match internal
To avoid merge conflicts. These are buildifier errors that will be
fixed in a followup cl.

Test: presubmits
Change-Id: I22c91c796aee16ef16f05471c2ff5221fa41d7b3
2023-09-07 12:29:21 -07:00
Cole Faust
8af587010b Merge "Clean staging dirs in build_image.py" into main am: c383825953
Original change: https://android-review.googlesource.com/c/platform/build/+/2736954

Change-Id: I8731127af428888c1be3035c0e9f3244964ab7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 17:18:12 +00:00
Alan Stokes
95cfb629d1 Add a build-time flag for DICE Changes in AVF
Bug: 299472719
Test: Builds
Change-Id: I1c9f4085781681e0070a0b9abade5e940a8d6ed6
2023-09-07 17:42:17 +01:00
Cole Faust
c383825953 Merge "Clean staging dirs in build_image.py" into main 2023-09-07 16:41:45 +00:00
Treehugger Robot
8093f24233 Merge "Fix $(PROGUARD_DICT_ZIP) builds" into main am: f49b9a3371
Original change: https://android-review.googlesource.com/c/platform/build/+/2744295

Change-Id: Ib917435e416aa4a0bda916212f1f3218eed4d061
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-07 02:50:29 +00:00
Cole Faust
206971459d Fix $(PROGUARD_DICT_ZIP) builds
Previously, when building the proguard dict zip, we got a lot of
warnings like these, and the files were always rebuilt:

```
[ 39% 9/23] Copy symbols with mapping: out/target/common/obj/APPS/HTMLViewer_intermediates/proguard_dictionary
ninja: Missing `restat`? An output file is older than the most recent input:
 output: out/target/common/obj/APPS/HTMLViewer_intermediates/proguard_dictionary.textproto
  input: out/soong/.intermediates/packages/apps/HTMLViewer/HTMLViewer/android_common/e10894d3da5db41239526c9048962355/proguard_dictionary
```

For some reason kati wasn't adding `restat=true` on these ninja rules.
Adding $(4) to KATI_RESTAT fixes it for some reason.

Test: m dist repeatedly doesn't give the restat warnings
Change-Id: Ie02526b3ab127f42bdc2db350d2dc468e7888fe2
2023-09-06 18:13:27 -07:00
Cole Faust
48b81e7386 Clean staging dirs in build_image.py
build_image.py now accepts a --input-directory-filter-file argument
that contains a list of files to consider from the input directory.
A new, temporary input directory will be created, and only the
considered files will be copied to it.

This removes most of the need for `m installclean`, as old files or
files built manually will no longer end up on the partition.

Bug: 205632228
Test: Presubmits
Change-Id: I4c82ac7f1ed49a37271755749c8f72afeeb7f295
2023-09-06 11:51:13 -07:00
Nikita Ioffe
76e1cc3400 Merge "Propagate device assignment related flags to soong" into main am: 9ee5ca6b37
Original change: https://android-review.googlesource.com/c/platform/build/+/2738597

Change-Id: Ib3c8c03ea8055e9deddbf792f168c1921dd3d583
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 13:29:44 +00:00
Nikita Ioffe
9ee5ca6b37 Merge "Propagate device assignment related flags to soong" into main 2023-09-06 12:37:24 +00:00
Treehugger Robot
f5cdd5b9a7 Merge "make: HWASan exclude path support" into main am: ed234171f8
Original change: https://android-review.googlesource.com/c/platform/build/+/2721814

Change-Id: I2622b382186b2e4fe512870b9891d03e3ca92ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 01:46:29 +00:00
Treehugger Robot
df395d2de5 Merge "Revert "DO NOT MERGE: Enable mainline prebuilts for device targets"" into aosp-main-future 2023-09-06 01:15:04 +00:00
Treehugger Robot
ed234171f8 Merge "make: HWASan exclude path support" into main 2023-09-06 01:14:12 +00:00
Cole Faust
62fcb3fcf5 Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main am: 56e8f7009c
Original change: https://android-review.googlesource.com/c/platform/build/+/2737051

Change-Id: Iaa7f81c3a30efd028a29070dabe74d638b0cd748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-06 01:00:51 +00:00
Cole Faust
56e8f7009c Merge "Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set" into main 2023-09-06 00:15:09 +00:00
Xin Li
e755915964 Revert "DO NOT MERGE: Enable mainline prebuilts for device targets"
This reverts commit 20545fcf21.

For AOSP targets we build the modules from source.

Bug: 299140674
Ignore-AOSP-First: staging branch for AOSP
Change-Id: Ib5cce306e40c7eee4292937a5240ec6df0a1e9c7
2023-09-05 15:06:59 -07:00
Cole Faust
c67e769b8c Install LOCAL_SOONG_INSTALL_SYMLINKS even if LOCAL_SOONG_INSTALLED_MODULE isn't set
LOCAL_SOONG_INSTALL_SYMLINKS can now be set by the install_symlink
module type. The install_symlink module type doesn't set
LOCAL_SOONG_INSTALLED_MODULE because make tries to copy that file
around, which doesn't work with a symlink.

Bug: 205632228
Test: built and ran the emulator observed the /system/bin/hwservicemanager symlink is still there
Change-Id: I1ec355b5ae057d0b7fe167674d70da6a4d03f6b5
2023-09-05 14:16:38 -07:00
Xin Li
236f2cd5e3 Merge "Merge UP1A.230905.019" into aosp-main-future 2023-09-05 18:36:11 +00:00
Treehugger Robot
61291bb9a7 Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main am: 4d779cf4cd
Original change: https://android-review.googlesource.com/c/platform/build/+/2737042

Change-Id: If10df8b82643b13ebae55415b3281b20e92f59d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 18:12:08 +00:00
Treehugger Robot
4d779cf4cd Merge "Reland: Add 16k/4k boot OTAs to /system partition" into main 2023-09-05 16:55:20 +00:00
Jared Duke
2e2c2ab1b8 Merge "Ensure special Dalvik annotations are kept" into main am: 2674152fdc
Original change: https://android-review.googlesource.com/c/platform/build/+/2737913

Change-Id: I17e8b34094ac694729a58ef4f29333df1cc71cce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-05 16:10:48 +00:00
Jared Duke
2674152fdc Merge "Ensure special Dalvik annotations are kept" into main 2023-09-05 15:49:17 +00:00
Nikita Ioffe
7902e5ed63 Propagate device assignment related flags to soong
Bug: 298007909
Test: builds
Change-Id: I0513784c813c856e9cb4674f1e33a7d83e411b02
2023-09-04 22:49:42 +01:00
Kiyoung Kim
e68edc80c1 Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main am: a28e56e1cc
Original change: https://android-review.googlesource.com/c/platform/build/+/2727594

Change-Id: I3968b8e6773bb60cb8ef064af931536177eaa019
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-04 09:00:11 +00:00
Kiyoung Kim
a28e56e1cc Merge "Do not set ro.(product.)vndk.version if VNDK is deprecated" into main 2023-09-04 08:09:56 +00:00
Jared Duke
cb3505c1be Ensure special Dalvik annotations are kept
These optimization annotations are special in that we don't want them
to have RUNTIME retention, but we do want them to be visible to ART.
R8 already has special rules to handle them, but with R8 full mode
it still requires a minimal keep rule for the given reference.

This allows usage of annotations like @NeverCompile from fully optimized
platform targets like SystemUI.

Bug: 215417388
Test: m + compare SystemUIGoogle.odex w/ @NeverCompile annotations
Change-Id: Id14bcc7b6d0d6dd385c60cfbe4d31f295cbaa5dc
2023-09-01 21:27:30 +00:00
Treehugger Robot
5f0bd8a83f Merge "Don't read the odex zip files when building sbom-metadata.csv" into main am: db21a2aee5
Original change: https://android-review.googlesource.com/c/platform/build/+/2731043

Change-Id: I3540341c1534781b8e224c11370bade90768055f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 19:48:20 +00:00
Nikita Ioffe
c8a6acbce8 Merge "Propagate RELEASE_AVF_ENABLE_MULTI_TENANT_MICRODROID_VM to soong" into main am: 68e7cb9c67
Original change: https://android-review.googlesource.com/c/platform/build/+/2735632

Change-Id: I6784feb23a37909bd74caf5563cf4067f2ffb9ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-01 19:47:55 +00:00