Commit graph

82922 commits

Author SHA1 Message Date
Treehugger Robot
ce15fb72bf Merge "Bump go.mod file to go 1.22" into main 2024-05-24 18:57:09 +00:00
Devin Moore
e22ef04596 Let Release_aidl_use_unfrozen add vintf_fragments am: 570d72b1cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3101979

Change-Id: Ide8dc698b27369713b8f2dcb9f17189b73958c7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 18:38:31 +00:00
Xin Li
8a31520ef8 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I4a6dd1c5e48db7085ea41035def31f0844948a46
Change-Id: If8ad1d0d87495bbd685f5f9f03f5eb7ea78bf192
2024-05-24 08:25:18 -07:00
Devin Moore
570d72b1cf Let Release_aidl_use_unfrozen add vintf_fragments
The product_config variable can be used to add different
vintf_fragments.

Ignore-AOSP-First: this is required for vFRC finalization and needs to be submitted ASAP. This can be cherry-picked to aosp after finalization.

Test: launch_cvd && atest hal_implementation_test
Test: lunch `next` && atest vts_treble_vintf_framework_test
Bug: 279809333
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b93c1a74cf89caef950c63d64b93f2ccfefcbce8)
Merged-In: Ied17ad4c4564a5d97f93001734fba7cc6648bbc2
Change-Id: Ied17ad4c4564a5d97f93001734fba7cc6648bbc2
2024-05-24 10:12:52 +00:00
Aditya Kumar
5735ef6777 Enable -Wfortify-source
Workaround for the post-submit failures
in b/341339765 has been merged.

Test: woodchipper and presubmit
Fixes: 315245071
Change-Id: I840f545cc0892cfdf9c896fd45761ba5308ff1ca
2024-05-24 04:43:18 +00:00
Kiyoung Kim
22152f6cda Remove VndkUseCoreVariant related code from build
VndkUseCoreVariant feature is deprecated along with VNDK. This change
removes related code from Soong.

Bug: 330100430
Test: AOSP CF build succeeded
Change-Id: Ie182c9e4dc9cf0a4fe9d5fddf5b36754ddb53d18
2024-05-24 10:45:28 +09:00
Jihoon Kang
d6638ef5e9 Merge "Propagate DirectlyInAnyApex to transitive dependencies" into main am: d02bd377da
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3098497

Change-Id: I0e06d50acfe4713728649c81dd66a0343108ab73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 01:03:20 +00:00
Jihoon Kang
d02bd377da Merge "Propagate DirectlyInAnyApex to transitive dependencies" into main 2024-05-24 00:58:05 +00:00
Kiyoung Kim
8733844236 Merge "Move sanitizer.libraries.txt logic into Soong" into main am: 41a1ff1a28
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3074033

Change-Id: Idf30d24485e2667d69a82401c2bcb436c79579a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 00:57:38 +00:00
Kiyoung Kim
41a1ff1a28 Merge "Move sanitizer.libraries.txt logic into Soong" into main 2024-05-24 00:39:00 +00:00
Cole Faust
2afb7746c2 Bump go.mod file to go 1.22
When building with blueprint, go 1.22 will be used, but if you used
go build or go test manually, the version in the go.mod will be used.

Go 1.22 has a subtle change that we want to make sure we're always
using: https://go.dev/blog/loopvar-preview

Bug: 330574836
Test: Presubmits
Change-Id: Idf46b77c4f817345c1f9aca039d8735bb101967f
2024-05-23 16:26:49 -07:00
Treehugger Robot
477f1f6b7e Merge "Fix post command of clang_verify." into main am: 7e2490ef4b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3099017

Change-Id: Iaf839c1de36b4dc6d19c8d1b1103e1e4ef8e86c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 23:19:30 +00:00
Treehugger Robot
7e2490ef4b Merge "Fix post command of clang_verify." into main 2024-05-23 22:59:37 +00:00
Jihoon Kang
46d66de1c1 Propagate DirectlyInAnyApex to transitive dependencies
`UpdateDirectlyInAnyApex` is used to propagate the ApexProperties
`DirectlyInAnyApex` and `InAnyApex` to the direct dependencies of the
direct dependencies of an apex bundle. In other words, this will be
propagated only to two-levels max dependency from the apex bundle.

However, the implementation library of the sdk library can have longer
dependency chain from the apex bundle than two levels:
e.g. apex -> bcpf -> sdk_lib -> sdk_lib impl lib

Therefore, even if the implementation library of the sdk library is
registered as a dependency using the "CopyDirectlyInAnyApexTag"
dependency tag, the ApexProperties would not be propagated to the
implementation library. In order to resolve this issue and recognize
the implementation library to be directly in apex and allow
instrumentation for the implementation library, this change proposes
propagating `DirectlyInAnyApex` and `InAnyApex` to transitive
dependencies on top of direct dependencies.

Test: DIST_DIR=dist_dir TARGET_BUILD_VARIANT=userdebug PRODUCT=mainline_modules_x86_64 COVERAGE_MODULES="uwb" ./vendor/google/build/build_unbundled_coverage_mainline_module.sh && \
unzip -l out/target/product/module_x86_64/jacoco-report-classes-all.jar and ensure that framework-uwb is included
Bug: 341170242

Change-Id: I27d7a74f6e5bc3e0a044d13c619f4897b6b2eb57
2024-05-23 22:40:35 +00:00
Treehugger Robot
309652433c Merge "Add test for parse error" into main am: 788100e2a8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3097978

Change-Id: I0935c853d61e46b3e26754cc75bc78ac4ff858e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 19:51:43 +00:00
Treehugger Robot
788100e2a8 Merge "Add test for parse error" into main 2024-05-23 19:50:12 +00:00
Treehugger Robot
1e6f57b6dc Merge "Allow experimental Java target 21 by default" into main am: bc44eb03db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3099283

Change-Id: Ie61b0ef0d32a9251b6c284c170acc6cb894aed8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 17:31:35 +00:00
Treehugger Robot
bc44eb03db Merge "Allow experimental Java target 21 by default" into main 2024-05-23 16:37:21 +00:00
Dennis Shen
efc53b111d Merge "Soong: remove obsolete proto lib from unit test" into main am: 54082dd8fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3097659

Change-Id: I63015d8cda84651c62996c608804431bbf08d92f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 16:18:42 +00:00
Dennis Shen
54082dd8fe Merge "Soong: remove obsolete proto lib from unit test" into main 2024-05-23 16:05:37 +00:00
Dennis Shen
6a7ffb3ec0 Soong: remove obsolete proto lib from unit test
Bug: b/321077378
Test: m and avd
Change-Id: Ib121da201e0be38d1acd82de1487f6cfba9e696c
2024-05-23 11:43:42 +00:00
Sorin Basca
253f8c045a Allow experimental Java target 21 by default
Bug: 342332820
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_21=true m
Change-Id: I6cc21bf191385df91c2446b7cd6291a0e3532bea
2024-05-23 10:28:24 +01:00
Kiyoung Kim
0d8908c2e4 Move sanitizer.libraries.txt logic into Soong
Currently sanitizer.libraries.txt module is defined from Makefile, while
all logics to create the list of modules is implmented within the Soong.
This change moves sanitizer.libraries.txt module definition into Soong,
so it can be generated without sharing list of modules over Make
variable.

Bug: 339131599
Test: AOSP CF build succeeded, with same list of modules in
/system/etc/sanitizer.libraries.txt

Change-Id: I987684877aa8dae221a03227d784f2a8ca4f5cc4
2024-05-23 17:50:46 +09:00
Justin Yun
5f53869dfe Build build_flags.json in soong
Define release_flags_json module type to install build_flags.json in
'etc'. release_flags_json reads the json files generated from the
soong release-config command.

Bug: 324996303
Test: build and see if the files are installed
Change-Id: I8cdcb7c61dd75cc54e4912d2ed7d1687f424151c
2024-05-23 14:58:08 +09:00
kellyhung
de1b6b0f64 Fix post command of clang_verify.
Bug: 311284462
Test: go test -run TestClangVerify
Change-Id: I116c4a3e1e5734a71e1bfd503ea2268a1a5643dd
2024-05-23 02:16:26 +00:00
Cole Faust
341d2f51ba Merge "Support soong config value variables on Configurable properties" into main am: c15b0234e9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3097980

Change-Id: I9bd40eadc89d0e3e6c93fe912ba47973819a33bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 00:18:50 +00:00
Cole Faust
aeecb75be2 Add test for parse error
This used to error out prior to the other cl in this topic.

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I6d95eb00c75836a5a0c60e07bfd4b306388591ed
2024-05-22 17:01:59 -07:00
Cole Faust
c15b0234e9 Merge "Support soong config value variables on Configurable properties" into main 2024-05-22 23:58:50 +00:00
Treehugger Robot
abd52ea70b Merge "Restrict validateApexClasspathFragments to active apex prebuilts" into main am: 5458a8437d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3096218

Change-Id: I5b1c92865d75100986ad7810613702ec564fa46d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 23:45:05 +00:00
Treehugger Robot
5458a8437d Merge "Restrict validateApexClasspathFragments to active apex prebuilts" into main 2024-05-22 23:29:04 +00:00
LaMont Jones
3fa8274e1c Merge "Generate specific message for build flag declarations artifact" into main am: aae7c4a302
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3097877

Change-Id: I5be904d3225aee740dd196c3b1c448540b42accd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 22:27:58 +00:00
LaMont Jones
aae7c4a302 Merge "Generate specific message for build flag declarations artifact" into main 2024-05-22 22:07:20 +00:00
Cole Faust
5f29706843 Support soong config value variables on Configurable properties
Configurable properties were previously not having their %s's
substituted with the actual value.

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: Id317e58a1fd878db5452d5d0a5df588021bcdcdb
2024-05-22 14:34:47 -07:00
LaMont Jones
6d9ff256ed Generate specific message for build flag declarations artifact
Many of the fields in `flag_artifact` are not valid in
the all_build_flag_definitions artifact.

Bug: 328495189
Test: manual
Change-Id: I00eab1ef76f67f7db2118a6fc0d5771e3dd39fbb
2024-05-22 13:46:34 -07:00
Cole Faust
fdec8723d5 Convert some properties to Configurable properties
Focusing on the properties needed to remove soong config modules from
packages/modules/Virtualization.

- prebuilt_etc's src and srcs
- filegroup's srcs and exclude_srcs
- rust's cfgs

Bug: 342006386
Test: m nothing --no-skip-soong-tests
Change-Id: I6971da744a17955f98104948e6f9614776955782
2024-05-22 13:33:42 -07:00
Treehugger Robot
18f487824f Merge "Instrument impl library belonging to apexes" into main am: b07e7fd542
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3095998

Change-Id: I12d4e387702fa38a777195ca8f6db83aa5f51801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 19:08:14 +00:00
Cole Faust
fbef4fc8f1 Merge "Add tests for unhandled select condition errors" into main am: 5e79b167b8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3081963

Change-Id: I5160e16094257d8d5883ea80307cb34115cdbc2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 19:07:57 +00:00
Treehugger Robot
b07e7fd542 Merge "Instrument impl library belonging to apexes" into main 2024-05-22 19:01:41 +00:00
Cole Faust
5e79b167b8 Merge "Add tests for unhandled select condition errors" into main 2024-05-22 18:51:10 +00:00
Cole Faust
86a72c2ab7 Merge "Log warnings to stdout instead of stderr" into main am: a642853510
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3094711

Change-Id: I455cbc577916378b5c808ef8c440f53e519ddacd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 17:51:29 +00:00
Cole Faust
a642853510 Merge "Log warnings to stdout instead of stderr" into main 2024-05-22 16:58:35 +00:00
LaMont Jones
d321b211bc release_config_proto: revert enum rename am: 44789260ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3093316

Change-Id: I1fd582f007f715a781e06883e75df4e9429d9e7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 15:07:35 +00:00
LaMont Jones
44789260ad release_config_proto: revert enum rename
This caused the existing textproto files to be misparsed.

Bug: 328495189
Test: manual
Change-Id: I53dc5045839b575e5fcaace39a435c28648010f6
2024-05-22 06:42:59 -07:00
Jihoon Kang
690df2e31b Instrument impl library belonging to apexes
https://r.android.com/3094444 has removed instrumentation from the
implementation library of the java sdk library. However, given that the
top level java sdk library was not being instrumented before removing
the compilation action, there is no way to get the coverage data for the
java sdk library included in the mainline modules with the
aforementioned change.

As seen in b/340174053, instrumenting all impl libraries by default
may lead to double instrumentation execution time error in some edge
cases (especially with make to soong dependency).

Given the above two conditions, this change allows instrumentation for
the implementation library of the java sdk library that belongs to
apex(es).

Test: lunch husky-trunk_staging-userdebug && EMMA_INSTRUMENT=true EMMA_INSTRUMENT_FRAMEWORK=true m droid dist
Test: DIST_DIR=dist_dir TARGET_BUILD_VARIANT=userdebug PRODUCT=mainline_modules_x86_64 COVERAGE_MODULES="uwb" ./vendor/google/build/build_unbundled_coverage_mainline_module.sh
Bug: 341170242
Change-Id: I175e02f61e139296f5a177e6fc1c3ded760ac028
2024-05-22 04:27:38 +00:00
Treehugger Robot
1835d95d99 Merge "Export release flag types to make/soong" into main am: d7b71490ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3094709

Change-Id: If9d5ddc4a854d875c6271a44d81fb565d0662f49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 02:43:54 +00:00
Treehugger Robot
d7b71490ae Merge "Export release flag types to make/soong" into main 2024-05-22 02:26:00 +00:00
Treehugger Robot
abac6e35f6 Merge "Better errors from build-flag" into main am: 423b8f6869
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3094708

Change-Id: Iae98b559dc268f52764a4402345f09f0d2f30960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 02:13:55 +00:00
Treehugger Robot
423b8f6869 Merge "Better errors from build-flag" into main 2024-05-22 01:53:20 +00:00
Treehugger Robot
479452bfe0 Merge "implement InstallDepNeeded for sdkLibraryComponentTag" into main am: 1bd60b7c79
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3095012

Change-Id: I918caa08e2e4c80852e5e085887131c29e373ae7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 01:33:13 +00:00
Cole Faust
3b30067f88 Log warnings to stdout instead of 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, but we don't want to see the spam of warnings release config
always produces.

Move the warnings to stdout so they stay in the file when we start
showing stderr.

Test: m nothing
Change-Id: Ic869675f917270a472142b6e3a4210acaad7499b
2024-05-21 18:17:47 -07:00