Commit graph

97881 commits

Author SHA1 Message Date
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
Spandan Das
fa22579c4d Add a release config map override for go devices
This is a followup to https://r.android.com/3069967 and moves the
override map to v/google_shared/build/release. This allows sharing of
build flags between internal and partner builds.

Bug: 342265627
Test: presubmits
Test: verified that this map shows up in `get_build_var
PRODUCT_RELEASE_CONFIG_MAPS` of a go device

Change-Id: I1cb874a27cd3029a47a4634598420fb5b218ce7d
2024-05-28 21:12:10 +00:00
Cole Faust
19dae885ab Merge "Add instructions to generate java keystore" into main am: 31e9d3d1b2
Original change: https://android-review.googlesource.com/c/platform/build/+/3104279

Change-Id: I4d8f3b5ffb70c6eb707717884f9ebf440924ba61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-28 20:41:11 +00:00
Cole Faust
31e9d3d1b2 Merge "Add instructions to generate java keystore" into main 2024-05-28 20:28:46 +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
Daniel Zhang
b46b840e18 Add instructions to generate java keystore
copied from commit message packages/inputmethods/LatinIME c884b6631f5d13637167f6bc66bbb81e6a00bd8f

Change-Id: Ie3d48041004930ca5e62c442778eb915fb99d257
Signed-off-by: Daniel Zhang <danielzhang130@gmail.com>
Test: none
2024-05-27 01:30:15 +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
Joe Onorato
8b8b002ad0 Merge changes from topics "envsetup_cleanup_2", "fix_get_build_var", "module_info_functions" into main am: 0f4e684dcf
Original change: https://android-review.googlesource.com/c/platform/build/+/3103323

Change-Id: Ib1dda05ad3d05309ebd1ccb6c3505b0991bcced3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-25 17:34:36 +00:00
Joe Onorato
2d85231cb6 Make get_build_var and get_abs_build_var into scripts. am: 0e68f70ab7
Original change: https://android-review.googlesource.com/c/platform/build/+/3103322

Change-Id: I3db7dfe91c1922a0c13cc0a25f9f06a5db0f4372
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-25 17:34:32 +00:00
Joe Onorato
1c1f18c9cf More moving shell functions in envsetup.sh to standalone scripts. am: 3acb308f98
Original change: https://android-review.googlesource.com/c/platform/build/+/3103321

Change-Id: Ib366837c4912edf61f13adfdda0c84667048d404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-25 17:34:30 +00:00
Joe Onorato
e5a3740024 Remove apparently unused 'pez' function from envsetup.sh am: ff277c5412
Original change: https://android-review.googlesource.com/c/platform/build/+/3103320

Change-Id: Ie52872572e0c4efa088225f42b69ea556ddaeaaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-25 17:34:25 +00:00
Joe Onorato
cb9fa217ee build/make side of move the module-info.json commands into standalone scripts. am: 6b543839b1
Original change: https://android-review.googlesource.com/c/platform/build/+/3103319

Change-Id: If9c7ca161f7040fcc1fdea8f5124aa67f0ade7ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-25 17:34:22 +00:00
Joe Onorato
5875b3f025 Remove the "provision" shell function from envsetup.sh am: d4e29a4b63
Original change: https://android-review.googlesource.com/c/platform/build/+/3103318

Change-Id: Ia1c86dff8bc457a436770f9745f8d695363fc70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-25 17:34:16 +00:00
Joe Onorato
0f4e684dcf Merge changes from topics "envsetup_cleanup_2", "fix_get_build_var", "module_info_functions" into main
* changes:
  Delete envsetup.sh functions that haven't worked for a long time.
  Make get_build_var and get_abs_build_var into scripts.
  More moving shell functions in envsetup.sh to standalone scripts.
  Remove apparently unused 'pez' function from envsetup.sh
  build/make side of move the module-info.json commands into standalone scripts.
  Remove the "provision" shell function from envsetup.sh
2024-05-25 17:17:01 +00:00
Joe Onorato
0e68f70ab7 Make get_build_var and get_abs_build_var into scripts.
Inside envsetup.sh there's an optimization to batch their calls. That's
now done by _get_build_var_cached and _get_abs_build_var_cached.

Bug: 340648588
Test: lunch
Change-Id: I63e39c7dc7705b0e6e7052cb8d9f9840ae398e6b
2024-05-24 14:37:51 -07:00
Joe Onorato
3acb308f98 More moving shell functions in envsetup.sh to standalone scripts.
Bug: 340648588
Test: run the scripts
Change-Id: I2b7ca19946b3669a9aef101b504cf4cfcbed1da3
2024-05-24 14:37:51 -07:00
Joe Onorato
ff277c5412 Remove apparently unused 'pez' function from envsetup.sh
Bug: 340648588
Test: treehugger, code search
Change-Id: I0a433b36c21a0bda4635463ab70f88d7ae40878c
2024-05-24 14:37:51 -07:00
Joe Onorato
6b543839b1 build/make side of move the module-info.json commands into standalone scripts.
Bug: 340648588
Test: run them
Change-Id: I5c072ee8481630327be9dccbbca501293a7b34cd
2024-05-24 14:37:51 -07:00
Joe Onorato
d4e29a4b63 Remove the "provision" shell function from envsetup.sh
It's been a long time since anything in the tree generated the
$ANDROID_PRODUCT_OUT/provision-device script needed for it to work.

Bug: 340648588
Test: treehugger
Change-Id: I5f34fb7b9ed9f6c06d422ddeb55a5ef9aa367538
2024-05-24 14:37:51 -07:00
Joe Onorato
1487ee1dba Delete envsetup.sh functions that haven't worked for a long time.
- Bugreports don't go to /sdcard/bureports, and adb bugreport has
  a much better UI now.
- I don't hink smoketest hasn't worked since the original Android
  git contribution, based on the path names in this function.

Bug: 340648588
Test: treehugger
Change-Id: Ie450f9740aa3fe7af50d64c2d9d7da56d6d3e39a
2024-05-24 14:37:51 -07: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
Xin Li
2389748ddb Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future 2024-05-24 21:16:16 +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
Treehugger Robot
c2cfb31c74 Merge "Add fs_config support for vendor_boot" into main am: 58ab571b38
Original change: https://android-review.googlesource.com/c/platform/build/+/2653760

Change-Id: If0343d21a7429bbffd385e49384505f00cbad5c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 20:08:39 +00:00
Treehugger Robot
58ab571b38 Merge "Add fs_config support for vendor_boot" into main 2024-05-24 19:31:07 +00:00
Gaurav Sarode
c5d1727048 Merge "Fix Automotive GSI RRO configuration" into main am: bdb6b87837
Original change: https://android-review.googlesource.com/c/platform/build/+/3098638

Change-Id: I67bfd610666a2018b9017fc0963ef10a93c6c7cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 19:16:57 +00:00
Treehugger Robot
38cd6585f6 Merge "Disable zucchini for all OTAs" into main am: 078c1c95c9
Original change: https://android-review.googlesource.com/c/platform/build/+/3101466

Change-Id: Idf9cd4afe688002111b90f00f92310d76fe40a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 19:16:28 +00:00
Treehugger Robot
699c8802f2 Merge "Update go.mod and go.work for go 1.22" into main am: 6d67f4b600
Original change: https://android-review.googlesource.com/c/platform/build/+/3101492

Change-Id: Idf5207b7b8e8723149dee82483114912b0c99eb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 19:16:01 +00:00
Gaurav Sarode
bdb6b87837 Merge "Fix Automotive GSI RRO configuration" into main 2024-05-24 19:15:13 +00:00
Treehugger Robot
078c1c95c9 Merge "Disable zucchini for all OTAs" into main 2024-05-24 19:03:06 +00:00
Treehugger Robot
6d67f4b600 Merge "Update go.mod and go.work for go 1.22" into main 2024-05-24 18:57:09 +00:00
Kelvin Zhang
d4bdbdced6 Disable zucchini for all OTAs
zucchini failure in OTA is observed. To unblock, disable
zucchini first. After the investigation are done and determined
zucchini is safe to enable, we will turn it back on.

Test: th
Bug: 342523982
Change-Id: I79c245356a356389328c788b3b7977b224e1df6a
2024-05-24 11:02:54 -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
Ashok Mutyala
8a3e361ea4 Add fs_config support for vendor_boot
Test:
1) add META/vendor_boot_filesystem_config.txt to    merge_config_other_item_list
2)Building vendor_boot image from target_files

Change-Id: Ia983d1119e30c46a6730566c567f13e25a65b0ff
2024-05-24 14:09:28 +00: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
30d7c0b8af Merge "Patch zips makefile to properly use private variables" into main am: 4caa319d36
Original change: https://android-review.googlesource.com/c/platform/build/+/3101478

Change-Id: I66453294d22382146a71b90e31a0ccdb01113638
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 23:46:10 +00:00
Cole Faust
9a6e468646 Update go.mod and go.work for go 1.22
Go 1.22 is more strict about GOPROXY=off, so we need to update the
go.work file to point at local copies of dependencies.

Bug: 330574836
Test: Presubmits
Change-Id: I37dbc821f138fe8977636316ebe3e7986ccdfa0e
2024-05-23 16:28:15 -07:00
Julien Desprez
4caa319d36 Merge "Patch zips makefile to properly use private variables" into main 2024-05-23 23:24:28 +00:00
Gaurav Sarode
b25c2dfc61 Fix Automotive GSI RRO configuration
Skipping config based RRO for automotive GSI builds

bug: 323238313
Test: local build
Change-Id: Ie2b6c5e10633cbd2c60b98738ee0676a49a7d21e
2024-05-23 22:49:49 +00:00
Vilas Bhat
3fc7f82463 Merge "ndk: Remove MALLOC_LOW_MEMORY config for the ndk" into main am: 995902c2e5
Original change: https://android-review.googlesource.com/c/platform/build/+/3097566

Change-Id: I14573325447a0221be2fefc3c576d74009b7ea55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 18:59:05 +00: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
Vilas Bhat
995902c2e5 Merge "ndk: Remove MALLOC_LOW_MEMORY config for the ndk" into main 2024-05-23 18:44:58 +00:00
Vilas Bhat
d98e1a86f3 ndk: Remove MALLOC_LOW_MEMORY config for the ndk
This switches the ndk to using scudo instead of jemalloc.

Bug: 337242400
Test:
Built NDK and tested lldb-server on both 4k and 16k devices
```
$ cd aosp && mkdir ndk_prebuilts
$ export OUT_DIR=ndk_prebuilts
$ ./build/soong/scripts/build-ndk-prebuilts.sh
$ cp -r ~/aosp/ndk_prebuilts/soong/ndk/sysroot/*
~/llvm-project/toolchain/prebuilts/ndk/releases/r27/toolchains/llvm/prebuilt/linux-x86_64/sysroot/
$ cd ../llvm-project
$ python3 toolchain/llvm_android/build.py
$ adb push out/stage2-install/runtimes_ndk_cxx/aarch64/lldb-server /data/local/tmp/
$ adb shell "getconf PAGE_SIZE"
16384
$ adb shell "strace /data/local/tmp/lldb-server"
<output trimmed>
mprotect(<address redacted>, 16384, PROT_READ) = 0
exit_group(0)                           = ?
+++ exited with 0 +++
```
Change-Id: I982595278d70cb39b9f6c7c8e9b95f12723fc5bf
2024-05-23 18:43:57 +00:00
Dennis Shen
612e50eb4b Merge "aconfig: remove read api lib's dependency on libbase and liblog" into main am: 25889d80af
Original change: https://android-review.googlesource.com/c/platform/build/+/3097838

Change-Id: I5f6afe2e7da2ded2db42ec8b05aceaae4eab6347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 16:00:39 +00:00