Xin Li
44cb713276
[automerger skipped] Merge "Merge Android 24Q2 Release (ab/11526283) to aosp-main-future" into aosp-main-future am: 2389748ddb
-s ours
...
am skip reason: Merged-In I713a528d437e3446d32461add648e3b52b036d7a with SHA-1 61b282a9b1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27273857
Change-Id: If51eab1b0aa8876c25aed6e3558117d827c31982
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 19:49:44 +00:00
Xin Li
cb086884bc
[automerger skipped] Merge Android 24Q2 Release (ab/11526283) to aosp-main-future am: b04e9cc36f
-s ours
...
am skip reason: Merged-In I713a528d437e3446d32461add648e3b52b036d7a with SHA-1 61b282a9b1
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27273857
Change-Id: I7d0bfd36e4f9f72d28562196abe8b312d129355c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 19:45:33 +00:00
LaMont Jones
81142507ca
Deliver all_release_configs.json as a build artifact am: 6b081071b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/27562359
Change-Id: I17c2026f2d597525d872db8b07799c064346aa06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 03:38:04 +00:00
LaMont Jones
6b081071b8
Deliver all_release_configs.json as a build artifact
...
Bug: 328495189
Test: manual
Ignore-AOSP-First: cherry-pick
Merged-In: Iebb07c303e6eae51d6c74dd80aa5ac2024b5629e
Change-Id: Iebb07c303e6eae51d6c74dd80aa5ac2024b5629e
2024-05-28 16:26:45 -07: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
Treehugger Robot
3cab784a60
Merge "Add fs_config support for vendor_boot" into main am: 58ab571b38
am: c2cfb31c74
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2653760
Change-Id: I0222b52c10d66b2949df7d1261540c777ea0b787
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 20:26:08 +00: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
Gaurav Sarode
c20424ed15
Merge "Fix Automotive GSI RRO configuration" into main am: bdb6b87837
am: c5d1727048
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3098638
Change-Id: I952e1761c897f00e1bf380f449917a9a33ff7132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 19:46:31 +00:00
Treehugger Robot
b42161d959
Merge "Disable zucchini for all OTAs" into main am: 078c1c95c9
am: 38cd6585f6
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3101466
Change-Id: I6298558649ea33cb1d478f6b3c00825678645fdc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 19:46:21 +00:00
Treehugger Robot
f2baf8949a
Merge "Update go.mod and go.work for go 1.22" into main am: 6d67f4b600
am: 699c8802f2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3101492
Change-Id: Ieca99343668e2974a677c989d1f7ab5abd1ee1ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 19:45:59 +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
Julien Desprez
17d2b25868
Merge "Patch zips makefile to properly use private variables" into main am: 4caa319d36
am: 30d7c0b8af
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3101478
Change-Id: I881ea8a4026dfb53e92d9de85a837a2219bd8720
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 00:21:31 +00: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
6fb4c8f827
Merge "ndk: Remove MALLOC_LOW_MEMORY config for the ndk" into main am: 995902c2e5
am: 3fc7f82463
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3097566
Change-Id: Id1e687fc2d971b839d51061cc5f4f287504129b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 19:10:47 +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
8746ef2b53
Merge "aconfig: remove read api lib's dependency on libbase and liblog" into main am: 25889d80af
am: 612e50eb4b
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3097838
Change-Id: I35012cd45e68798389863e5d7ced5e5ec64ff66f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 16:13:14 +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
Dennis Shen
25889d80af
Merge "aconfig: remove read api lib's dependency on libbase and liblog" into main
2024-05-23 15:27:16 +00:00
Dennis Shen
a0624828b2
aconfig: remove read api lib's dependency on libbase and liblog
...
Bug: b/321077378
Test: atest -c
Change-Id: I0bc7780de2123021e1cc9f7a29ca3f7dabebcd40
2024-05-23 12:30:31 +00:00
Treehugger Robot
d049f5bb7d
Merge "Remove no-op config." into main am: cfceeceb3a
am: d589c0bd29
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3097721
Change-Id: Id8b7f0734f2067133250688095f09383e3557f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 22:32:29 +00:00
Treehugger Robot
d589c0bd29
Merge "Remove no-op config." into main am: cfceeceb3a
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3097721
Change-Id: I6ddf4a1ef52b59b2ab48643b5aa3a79d72b0cdc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 22:15:31 +00:00
Treehugger Robot
cfceeceb3a
Merge "Remove no-op config." into main
2024-05-22 21:53:02 +00:00
Dennis Shen
a94943dbb7
Merge "aconfig: update storage read api" into main am: 7b09e95c89
am: 298335d9c9
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3096736
Change-Id: I8d873543a0b7ea7699098dc01e064f746f820ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 21:43:03 +00:00
Dennis Shen
1ce0dc9a78
Merge "aconfig: update storage read api" into main am: 96c8bec5a4
am: 619582971c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3092646
Change-Id: I97206d418675b04b03fa09806301464358b987a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 21:42:58 +00:00
Dennis Shen
298335d9c9
Merge "aconfig: update storage read api" into main am: 7b09e95c89
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3096736
Change-Id: Id013800ce502c1eaed1e9669b25d94b24347de08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 21:14:20 +00:00
Dennis Shen
619582971c
Merge "aconfig: update storage read api" into main am: 96c8bec5a4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3092646
Change-Id: Ia1d1f901da01a1918e2e8501b56a0e82b6ea30aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 21:14:14 +00:00
Dennis Shen
7b09e95c89
Merge "aconfig: update storage read api" into main
2024-05-22 20:52:40 +00:00
Dennis Shen
96c8bec5a4
Merge "aconfig: update storage read api" into main
2024-05-22 20:52:40 +00:00
Dan Albert
e35bb7c9b3
Remove no-op config.
...
This was copied over from when Soong required us to define it in the
properties file, but this is the default and we also don't care.
Bug: None
Test: None
Change-Id: I35311093c83fddcb7c413535fbb50a126b615036
2024-05-22 20:49:53 +00:00
Dennis Shen
70208daaaa
aconfig: update storage read api
...
Bug: b/321077378
Test atest -c
Change-Id: I53fe6c34466f32d5283d0bdbf4736c8ecd20ef99
2024-05-22 19:25:35 +00:00
Dennis Shen
5590478580
aconfig: update storage read api
...
Update storage read api to not find storage file location from a pb
file, instead directly read from /metadata copy. Previously for
package.map and flag.map, we are reading from the respective RO
partition. Now we are reading from /metadata/maps dir. This has a few
advantages:
1, early flag availability, since /metadata can be mounted much earlier
than mainline modules, so it would make mainline flags availabile even
before mainline modules are mounted.
2, we no longer need to read from a pb file to find where package.map
and flag.map are. Thus the read api can be further simplified and
downsized. With this change, we are able to shrink the cc flag read api
lib size from 171k to 120k.
Bug: b/321077378
Test atest -c
Change-Id: Ic9086fe4c49c139a4d1c66a8d472023a88c9dd17
2024-05-22 19:25:17 +00:00
Cole Faust
910625769c
Merge "Show release-config's stderr" into main am: 22135a0b0c
am: 38f3ff3e64
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3096311
Change-Id: Ia5844ca454294ef597980850412ae6cc5d4ba1c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 18:11:56 +00:00
Treehugger Robot
ad69f19a01
Merge "add csv output to format_benchmarks" into main am: 802de330d3
am: efb355cde4
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3094187
Change-Id: Ifc0e91534824a3fb5298907f730902187e901ac8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 18:11:40 +00:00
Cole Faust
38f3ff3e64
Merge "Show release-config's stderr" into main am: 22135a0b0c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3096311
Change-Id: I10c15cdd013825e2e5d8df731f6cacf1c93629cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 17:51:29 +00:00
Treehugger Robot
efb355cde4
Merge "add csv output to format_benchmarks" into main am: 802de330d3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3094187
Change-Id: Iecabc5b4e7f954610c930ff154c5a9e9a28d0402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 17:48:47 +00:00