Commit Graph

37479 Commits

Author SHA1 Message Date
Yihan Dong
c28c06c89a Merge "Collect xTS jar/apk packages from soong intermediate dirs" into main am: 69fe181b1d
Original change: https://android-review.googlesource.com/c/platform/build/+/3105340

Change-Id: I5ea7ea5dde42a0f99b828bb92c95616dd75ae803
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 08:55:48 +00:00
Yihan Dong
69fe181b1d Merge "Collect xTS jar/apk packages from soong intermediate dirs" into main 2024-05-31 08:46:25 +00:00
Nate Myren
c39dc6a8d7 Merge "Set appcompat system properties flag if userdebug/eng" into main am: 7de8a01cc1
Original change: https://android-review.googlesource.com/c/platform/build/+/3107744

Change-Id: Iffb914e72be4c1c69bd59f5b2caec5aad28e55f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 01:38:56 +00:00
Nate Myren
7de8a01cc1 Merge "Set appcompat system properties flag if userdebug/eng" into main 2024-05-31 01:31:38 +00:00
Kiyoung Kim
69f5dbb0d0 Remove all VNDK deprecation flags
VNDK is fully deprecated, so flags to deprecate VNDK is no longer
needed. This change removes all flags deprecates VNDK.

Bug: 330100430
Test: AOSP CF build succeeded
Change-Id: Ifc918a875d7d5bed232165873ee9b0c562841594
2024-05-31 09:52:18 +09:00
Treehugger Robot
64308c7604 Merge "Deliver inheritance_graph-$(TARGET_PRODUCT).dot" into main am: 3cb645bef1
Original change: https://android-review.googlesource.com/c/platform/build/+/3106444

Change-Id: I59088fabe26d72aeb84b60716cc9642a30d4bddf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 00:43:15 +00:00
Joe Onorato
5f14162375 Rename _all_release_configs so it's more accessible for list_releases
command

Bug: 340648588
Test: list_releases
Change-Id: Id5397a0e06585897866b7497837e1a106ab0c28e
2024-05-30 15:48:07 -07:00
LaMont Jones
b324a11a6a DO NOT MERGE ANYWHERE Require protobuf for build flags
This change forces build flags from .scl to .textproto format.

Bug: 328495189
Bug: 338450506
Test: manual, TH
Change-Id: Ia33aae158d62c12666d97449cea0c02b60550a21
2024-05-30 13:49:10 -07:00
Nate Myren
eb2648eacc Set appcompat system properties flag if userdebug/eng
Bug: 331307495
Test: m
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:c7d08b74321a355c5a5daefdb899d1ac63b861fa)
Merged-In: I7d3080487b60536f5948ab1482a3fd4aee8371d4
Change-Id: I7d3080487b60536f5948ab1482a3fd4aee8371d4
2024-05-30 19:03:56 +00:00
Steven Moreland
432bd660dc check_elf_file: check prebuilts are aligned
WARNING: two things still need to be done
1. this should probably only be enabled when PAGE_SIZE
   is undefined, but I'm curious what other targets
   break now.
2. we may need a per-prebuilt way to disable this,
   like some of the other settings here.

For prebuilts added onto a device, we can check the
page alignment matches the one declared in the build
configuration.

Bug: 342466032
Test: manually, by changing the script to require 64 KB
  alignment, I was able to see its errors on new targets.
Change-Id: Ic118245e64d67204bf5fa740a3e1afb7325b34f5
2024-05-30 17:31:08 +00:00
LaMont Jones
52f63ed170 Deliver inheritance_graph-$(TARGET_PRODUCT).dot
Bug: 328495189
Test: manual, TH
Change-Id: I9cf6a7e2eed173add02bfb8ccb10a3bf31e7812c
2024-05-29 14:59:28 -07:00
Yihan Dong
f55cd66417 Collect xTS jar/apk packages from soong intermediate dirs
These data will be used in API map analysis.

Test: m
Bug: 328699028

Change-Id: Ie95d8fd46ecb3b2eec4441b91c5ad5297558f3ee
2024-05-29 17:52:21 +08:00
Treehugger Robot
652e8c890f Merge "Fix syntax error in Makefile" into main am: d4f1d2e6e8
Original change: https://android-review.googlesource.com/c/platform/build/+/3098978

Change-Id: I5434c715719309f792300b2586baf88c2fb9127f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 21:48:15 +00:00
Treehugger Robot
d4f1d2e6e8 Merge "Fix syntax error in Makefile" into main 2024-05-28 21:27:38 +00:00
Alice Wang
e73a902801 Merge "Allow AVF remote attestation to be disabled" into main am: 9347e36e33
Original change: https://android-review.googlesource.com/c/platform/build/+/3092139

Change-Id: I1ce6dfb7f4fe21f0e6b0e84d0ea7e1a3dee1e461
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-27 08:57:16 +00:00
Alice Wang
9347e36e33 Merge "Allow AVF remote attestation to be disabled" into main 2024-05-27 08:38:37 +00:00
Kiyoung Kim
bbb9d437b1 Merge "Do not pass VndkUseCoreVariant into Soong" into main am: 62d2ff000e
Original change: https://android-review.googlesource.com/c/platform/build/+/3102697

Change-Id: I6946af113dbfe7ffff5f3be833dd236bd410936e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-27 01:11:55 +00:00
Kiyoung Kim
62d2ff000e Merge "Do not pass VndkUseCoreVariant into Soong" into main 2024-05-27 00:59:37 +00:00
Steven Moreland
27f601f5d9 Consider non-shipping lunch targets to be future.
Many places in the codebase have checks like this:

    if shipping level > X: do cool thing Y

This is great because it reduces the cost to upgrade and test
old Android devices or refactor their code. However, many
targets, such as the NDK, the SDK, mainline modules, and so on
do not set a shipping level, so they don't get to do the cool
thing Y.

In order to resolve this, we could modify every check to check
the default case. However, this is an invasive change, and it
is not maintainable. Instead, consider non-shipping products to
always be in the future.

In general, Android features are required to be backwards
compatible, so this should always work for things like mainline.

Also note, this means when someone adds a new feature Y like this,
they'll clearly see the impact of it being added everywhere, rather
than on such a small selection of newly shipping devices. This
avoids a risk where a change needs to be run on mainline modules (or
other targets) but is not tested in this configuration from the
start.

Future work: many `ifndef` checks can be cleaned up after this,
or if this approach makes sense, they can be cleaned up in this
CL.

Bug: 339026799
Bug: 279808973
Bug: 333908433
Test: builds of:
- errorprone-trunk_staging
- mainline_modules_sdks-trunk_staging-userdebug
- mainline_modules_x86_64-trunk_staging-userdebug
- ndk
- sdk-trunk_staging-userdebug

Test: too large number gives:
  build/make/core/product_config.mk:598: error: integer greater than 10001 is not supported!.

Change-Id: I17c34267f774ea8b9265e1d798a67af7838715c5
2024-05-24 21:59:35 +00:00
Treehugger Robot
0497847a43 Merge "Deliver all_release_configs.json as a build artifact" into main am: d9fe8f5a27
Original change: https://android-review.googlesource.com/c/platform/build/+/3097723

Change-Id: I9010d16aebc8a60fa2d47c405745ea69bf07219f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 21:33:04 +00:00
Treehugger Robot
d9fe8f5a27 Merge "Deliver all_release_configs.json as a build artifact" into main 2024-05-24 21:16:28 +00:00
LaMont Jones
3b9a93512e Deliver all_release_configs.json as a build artifact
Bug: 328495189
Test: manual
Change-Id: Iebb07c303e6eae51d6c74dd80aa5ac2024b5629e
2024-05-24 13:12:14 -07:00
Xin Li
b04e9cc36f Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I713a528d437e3446d32461add648e3b52b036d7a
Change-Id: I7fdd415a218d1425f7fc37095d02c674ddfae6eb
2024-05-24 08:30:06 -07:00
Pierre-Clément Tosi
22dd3211b2 Use generated pvmfw_embedded_key_pub_bin
Now that pvmfw_embedded_key points to a PEM file, obtain the .avbpubkey
(extracted public key in AVB-specific binary format) from the generated
pvmfw_embedded_key_pub_bin instead.

Bug: 342549834
Test: m out/target/product/${PROD}/pvmfw_embedded.avbpubkey
Change-Id: Iaf0d166816976b5f9db7fe15c78b788d748adcc4
2024-05-24 10:59:44 +01:00
Alice Wang
28a57dc1cc Allow AVF remote attestation to be disabled
This CL adds a variable in makefile that allows the
AVF remote attestation feature to be disabled easily.

The remote attestation feature is opt-in by default, as it
is a strongly recommended feature from Android V. It will
be disabled if PRODUCT_AVF_REMOTE_ATTESTATION_DISABLED is
set to true in the Makefile, otherwise it will be enabled
when the feature flag
RELEASE_AVF_ENABLE_REMOTE_ATTESTATION is on.

Bug: 331269709
Bug: 341292601
Test: run VM remote attestation on Pixel 6 and check it is
disabled

Change-Id: Id48ebd0eacf0d7a6c69b9100aee5ab6e4f112fe5
2024-05-24 09:22:41 +00:00
Kiyoung Kim
5ed5fe8b62 Do not pass VndkUseCoreVariant into Soong
VNDK use core variant is deprecated, so there is no meaning to pass this
variable into Soong. This change removes TARGET_VNDK_USE_CORE_VARIANT
passing into soong variable.

Bug: 330100430
Test: AOSP CF build succeeded
Change-Id: I5f46764862c7b32fbf48b942c4ac07426e97d6dd
2024-05-24 11:28:42 +09:00
Julien Desprez
fdb60734e9 Patch zips makefile to properly use private variables
Test: m device-platinum-tests, m performance-tests
Bug: 341947105
Change-Id: Ic77d0dc71450f7c97717291e0f998dc53fbb31b1
2024-05-23 11:55:47 -07:00
Justin Yun
0949453dd2 Build build_flags.json in soong
Move the make build rule for build_flags.json to soong.

Bug: 324996303
Test: m --no-skip-soong-tests
Change-Id: I958d5bb78db1d63b6145ac6a498490faa2fea315
2024-05-23 15:08:51 +09:00
junki486.lee
8a4dca1d8c Fix syntax error in Makefile
When calling extract-avb-chain-public-keys method with
BOARD_CUSTOMIMAGES_PARTITION_LIST, syntax error leads to build failure.
Fix it by removing incorrect backslash.

Test: build with BOARD_CUSTOMIMAGES_PARTITION_LIST

Change-Id: I017244eac7ef0d04f67ba68412ec6a95cca2e302
Signed-off-by: Junki Lee <junki486.lee@lge.com>
2024-05-23 13:18:40 +09:00
Spandan Das
7930dd7fb2 Drop product config include tags
This product config variables were previously used to prune Android.bp
files from soong analysis using blueprint_package_includes

Bug: 308188212
Test: m nothing
Change-Id: If3f88dbe2abb2db5f1112981e706d8a2cb228895
2024-05-22 19:23:46 +00:00
Cole Faust
22135a0b0c Merge "Show release-config's stderr" into main 2024-05-22 16:58:35 +00:00
Cole Faust
50dc47d13a Show release-config's stderr
Currently, both stdout and stderr are redirected to a file. We want
stderr to be visible on the terminal in case the release config
fails.

Test: m nothing
Change-Id: I1337718fe8f9394be3017cc8b6d76f8dc1a94ef0
2024-05-21 18:16:21 -07:00
Cole Faust
a1848c3833 Export release flag types to soong
Bug: 323382414
Test: Presubmits
Change-Id: I8f91dfe84f9606a8cdbd2ca04013b1c10a146962
2024-05-21 16:53:55 -07:00
Julien Desprez
250a70d366 Merge "Add a new device-platinum-tests zip" into main 2024-05-21 17:15:38 +00:00
Julien Desprez
73378355fa Merge "Add a performance-tests zips for perf tests" into main 2024-05-21 02:57:06 +00:00
Julien Desprez
e28650f4b0 Add a new device-platinum-tests zip
This is meant for platinum tests that require device
signing. They will be migrated out of device-tests.zip

Test: presubmit
Bug: 341719739
Change-Id: Ie30c4bedc2edf4f537deb49099d0e23b4eec2626
2024-05-20 22:58:37 +00:00
Julien Desprez
100f641823 Add a performance-tests zips for perf tests
Test: presubmit, m performance-tests
Bug: 341719739
Change-Id: Ieb3798cf7ded6d8e669ae7cef0ef3e5bf03415b7
2024-05-20 22:57:31 +00:00
Treehugger Robot
d429640373 Merge "Make side of converting refreshmod to a shell script" into main 2024-05-20 22:38:13 +00:00
Joe Onorato
143f9e0b72 Make side of converting refreshmod to a shell script
Bug: 340648588
Test: refreshmod
Change-Id: Iedbdd31f9a58cb609a826dfe8066c9eff8aa5904
2024-05-20 14:22:20 -07:00
Hugo Drumond Jacob
faf9b0128c Dump the required modules into module-info.json
Certain applications, like tracking the dependency chain of modules,
knowing the "required" dependencies is required.

In this context, "required" here means the `required` field in
Android.bp files.

Bug: 339193439
Test: Inspect module-info.json for the `required` field
Change-Id: I09977bf71a0a0ae46ea9268ce1faa5c90673bb7a
2024-05-20 18:35:24 +02:00
Pawan Wagh
c75b3e352b Merge "Add PRODUCT_16K_DEVELOPER_OPTION to product.mk" into main 2024-05-17 22:46:58 +00:00
Treehugger Robot
baf2c6bff2 Merge "Don't reference target-specific variable from dependency list" into main 2024-05-17 21:58:12 +00:00
Pawan Wagh
ea2121dc56 Add PRODUCT_16K_DEVELOPER_OPTION to product.mk
Test: m
Bug: 295035851
Change-Id: I5c7474efe873eca5369790a564ee483967541f6b
2024-05-17 21:41:32 +00:00
Cole Faust
bb1d4a431d Don't reference target-specific variable from dependency list
Apprently target-specific variables are only valid for the body of
the target, not its dependency list, so the dependency on the zip file
wasn't being added.

Bug: 340392832
Test: m, rm file_list.txt and the zip file, m again, and ensure we don't get an error that the zip file doesn't exist
Change-Id: Idaca6606ff24055aa98c78ca1206b587cc1df4d2
2024-05-17 13:56:27 -07:00
Treehugger Robot
a8bb538db6 Merge "Document that ro.dalvik.vm.enable_uffd_gc has a limited lifetime." into main 2024-05-17 20:04:50 +00:00
LaMont Jones
48132d6580 Merge "Mark files used in release configs as kati dependencies" into main 2024-05-17 00:40:55 +00:00
Spandan Das
1256ba17e6 Merge "Reland align boot jar exclusion with apex_contributions" into main 2024-05-16 23:57:13 +00:00
Treehugger Robot
43a6baa2a0 Merge "Introduce RELEASE_AVF_ENABLE_NETWORK build flag into Soong" into main 2024-05-16 23:44:39 +00:00
LaMont Jones
052282b731 Mark files used in release configs as kati dependencies
Bug: 341117082
Bug: 328495189
Bug: 339707888
Test: manual, TH
Change-Id: I4377846844ad172a2760de309ee343b980e893f1
2024-05-16 15:21:29 -07:00
LaMont Jones
a32d67dd1a Merge "Revert "Avoid re-running kati unnecessarily."" into main 2024-05-16 18:36:49 +00:00