Commit Graph

97788 Commits

Author SHA1 Message Date
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
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
Julien Desprez
4caa319d36 Merge "Patch zips makefile to properly use private variables" into main 2024-05-23 23:24:28 +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
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
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
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
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
Cole Faust
22135a0b0c Merge "Show release-config's stderr" into main 2024-05-22 16:58:35 +00:00
Treehugger Robot
802de330d3 Merge "add csv output to format_benchmarks" into main 2024-05-22 16:49:27 +00:00
Treehugger Robot
52d1393edb Merge "check-flagged-apis: make interfaces inherit from java/lang/Object" into main am: fe822ece0d
Original change: https://android-review.googlesource.com/c/platform/build/+/3094244

Change-Id: I45e52b85d04818033d0433f194263690cdf23f13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 14:37:36 +00:00
Treehugger Robot
fe822ece0d Merge "check-flagged-apis: make interfaces inherit from java/lang/Object" into main 2024-05-22 14:18:48 +00:00
Mårten Kongstad
aa41dac8d8 check-flagged-apis: make interfaces inherit from java/lang/Object
When parsing API signature files, check-flagged-apis relies on
ClassItem.superClass to get the parent class of a class or interface.
That method always returns null for interfaces.

When generating api-versions.xml, metalava marks interface classes as
inheriting from java/lang/Object:

  <class name="android/os/Parcelable" since="1">
    <extends name="java/lang/Object"/>
    [...]
  </class>

This confuses check-flagged-apis when comparing data parsed from both
sources, as the symbol signatures will be identical, but the superclass
entries differ. Work around this by explicitly marking all interfaces
as inheriting from java/lang/Object when parsing API signature files.

Bug: 334870672
Test: atest --host check-flagged-apis-test
Change-Id: Icbb8f7d4c3d4232a083289a778b347e33a0856ab
2024-05-22 15:13:54 +02:00
Treehugger Robot
290eb2a1e2 Merge "Export release flag types to soong" into main am: 0ea5497ce4
Original change: https://android-review.googlesource.com/c/platform/build/+/3096106

Change-Id: Ic75a085dce3dfa8a27cef63416975c73b2eb4aa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 02:43:54 +00:00
Treehugger Robot
0ea5497ce4 Merge "Export release flag types to soong" into main 2024-05-22 02:26:01 +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
Zhuoyao Zhang
83057de6fd Merge "Fix a bug in run_tool_with_logging script" into main am: 1c51c14142
Original change: https://android-review.googlesource.com/c/platform/build/+/3095242

Change-Id: I06cbcabea0e00a1924e2008326b4b3ac6378aee3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 20:33:18 +00:00
Zhuoyao Zhang
1c51c14142 Merge "Fix a bug in run_tool_with_logging script" into main 2024-05-21 20:14:05 +00:00
Treehugger Robot
4fddfbc8d8 Merge "16k: build: Enable PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO on the ndk target" into main am: 5b0dfe41b8
Original change: https://android-review.googlesource.com/c/platform/build/+/3092184

Change-Id: Ice050f7a96b76617eeb898b94381dcf6e135a7a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 19:07:27 +00:00
Treehugger Robot
5b0dfe41b8 Merge "16k: build: Enable PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO on the ndk target" into main 2024-05-21 18:26:27 +00:00
Zhuoyao Zhang
dfdf19f225 Fix a bug in run_tool_with_logging script
Fix the case when call a tool with run_tool_with_logging with a single
arg start with -- (e.g. adb --help), make sure when we pass that arg
to the logger, it treat it as the value for the --tool_args option
instead of a separate option

Test: atest run_tool_with_logging_test
Test: manually run source build/envsetup.sh and run adb --help and check
the event log is sent to clearcut. Tested with both bash and zsh
Bug: 341382247

Change-Id: I1e09907f267b453cb62876e171064daa021e3d91
2024-05-21 18:10:01 +00:00
Julien Desprez
4cbfc0e4d0 Merge "Add a new device-platinum-tests zip" into main am: 250a70d366
Original change: https://android-review.googlesource.com/c/platform/build/+/3095511

Change-Id: Ic3179cb40c4a61f97d6a19243800a16ddd1a2669
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 17:36:03 +00:00
Julien Desprez
250a70d366 Merge "Add a new device-platinum-tests zip" into main 2024-05-21 17:15:38 +00:00
Vilas Bhat
2c51ebf669 16k: build: Enable PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO on the ndk target
Test: Presubmit and manual testing
Bug: 337242400
Change-Id: I89f91566ebe7dcaf8056859549d5769d2f5e936e
2024-05-21 16:33:04 +00:00
Julien Desprez
2322b7c8e9 Merge "Add a performance-tests zips for perf tests" into main am: 73378355fa
Original change: https://android-review.googlesource.com/c/platform/build/+/3095241

Change-Id: Ie35c7d93eaceb3a5214092758f7b6bfbf9add283
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 03:23:14 +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
6d8a2cc8f5 Merge "Make side of converting refreshmod to a shell script" into main am: d429640373
Original change: https://android-review.googlesource.com/c/platform/build/+/3094898

Change-Id: I4ef3db825e742f0c805af76d3e115c17e4667b2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-20 22:41:07 +00:00
Treehugger Robot
a2352f634f Merge "Clean cruft out of envsetup.sh" into main am: 9f94972ab0
Original change: https://android-review.googlesource.com/c/platform/build/+/3094897

Change-Id: I2df07f0be492d7cd32322b14e5418d88f246c31a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-20 22:40:40 +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
Treehugger Robot
9f94972ab0 Merge "Clean cruft out of envsetup.sh" into main 2024-05-20 22:38:09 +00:00
Joe Onorato
b9ff8e4205 add csv output to format_benchmarks
Test: format_benchmarks --csv
Bug: 316189534
Change-Id: I9a19861ed1ca6249c6e6ddbed0fcf9574f871d93
2024-05-20 14:23:00 -07: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
Joe Onorato
1b9ab2903c Clean cruft out of envsetup.sh
Most if it moved to build/soong/bin as standalone scripts

Bug: 340648588
Test: ran the scripts
Change-Id: I69bff94a2293e2563d58d29b12f7926a9229f9d4
2024-05-20 14:22:20 -07:00
Treehugger Robot
8d82265a2d Merge "Dump the required modules into module-info.json" into main am: 49809a3fb0
Original change: https://android-review.googlesource.com/c/platform/build/+/3093546

Change-Id: I204f7593f0ec46846d299d05af0fb5559087b329
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-20 18:03:14 +00:00