Commit graph

82314 commits

Author SHA1 Message Date
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
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
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
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
Treehugger Robot
1bd60b7c79 Merge "implement InstallDepNeeded for sdkLibraryComponentTag" into main 2024-05-22 01:15:52 +00:00
Cole Faust
751a4a5fa2 Export release flag types to make/soong
And use the types to appropriately type selects on the release
variables.

Bug: 323382414
Test: Presubmits
Change-Id: Ide7eca95662caaa7b4be42e20399d9fcd7fed35f
2024-05-21 18:09:05 -07:00
LaMont Jones
310ccc2ad2 Better errors from build-flag
When `get_build_var` fails, output the error.

Bug: none
Test: manual
Change-Id: If4dc13e0e895823f50de1f5c7e929bb05eac69a0
2024-05-21 17:52:48 -07:00
Treehugger Robot
1415729eea Merge changes I6b1d6dcd,I97eb864e,I155c26b1 into main am: 1ab18fc547
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3092860

Change-Id: I709cf4ad60b60e6b68bf3da3d8585de0a57e41c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 00:18:06 +00:00
Cole Faust
fd4249510d Merge "Update select tests for optionals" into main am: 4ab1563fe5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3094707

Change-Id: Ie2807b57dd7c1a9cbbad0c3449e607eba239f284
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 00:17:48 +00:00
Joe Onorato
a06b6fc59a Merge "Fix the problem of resource integration confusion caused by not adding regional configuration tailoring." into main am: 30f6e28295
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3092729

Change-Id: Id88e7feb94b8a1eecb9297b4cdfe5eb3527f645b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 00:17:32 +00:00
Treehugger Robot
1ab18fc547 Merge changes I6b1d6dcd,I97eb864e,I155c26b1 into main
* changes:
  Minor flagging cleanup
  Add build_flag_declarations module
  Add build-flag-declarations tool
2024-05-22 00:03:08 +00:00
Cole Faust
4ab1563fe5 Merge "Update select tests for optionals" into main 2024-05-22 00:02:41 +00:00
Joe Onorato
30f6e28295 Merge "Fix the problem of resource integration confusion caused by not adding regional configuration tailoring." into main 2024-05-22 00:02:04 +00:00
Treehugger Robot
ad0a9f4bed Merge "Make dirs a configurable property" into main am: 5c04707a3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3094914

Change-Id: I1e45d399fa997453637f3a6d78e3782fce6ef0fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 23:08:41 +00:00
Treehugger Robot
382afbaf9b Merge "Remove printf in tests" into main am: c7360364fc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3096237

Change-Id: I40d506dd6b8a9c61d9b505a23af971b4bebb384a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 23:08:31 +00:00
Treehugger Robot
5c04707a3f Merge "Make dirs a configurable property" into main 2024-05-21 22:55:03 +00:00
Treehugger Robot
c7360364fc Merge "Remove printf in tests" into main 2024-05-21 22:50:22 +00:00
LaMont Jones
52df388f5a Minor flagging cleanup
Add an underscore to make the linter more happy.

Bug: 339672075
Bug: 328495189
Test: manual
Change-Id: I6b1d6dcd0aff3c82551021b3f4768a34f27d6fb2
2024-05-21 15:35:28 -07:00
LaMont Jones
c6aef16816 Add build_flag_declarations module
And generate build-flags/build_flags.{pb,textproto} files

Bug: 328495189
Test: manual,TH
Change-Id: I97eb864e2d84bc606fef7e9077554894338edaa0
2024-05-21 15:35:22 -07:00
LaMont Jones
fa4ba22a41 Add build-flag-declarations tool
This will be used to gather build flag declarations

Bug: 328495189
Test: manual, TH
Change-Id: I155c26b1442347c4d433c9cbf22b94d944636702
2024-05-21 15:34:11 -07:00
Cole Faust
d9c6a5b802 Make dirs a configurable property
The microdroid system image customizes dirs using soong config
variables, make it configurable so that selects can be used instead.

Bug: 342006386
Test: Presubmits
Change-Id: I4fbf4dc0a04ad1d1f6539476408606028390cd64
2024-05-21 14:54:00 -07:00
Cole Faust
749eeaa94c Update select tests for optionals
Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I314719c9e287638acbc1ef82651d14fee6e1a55a
2024-05-21 14:19:05 -07:00
Cole Faust
167c9be663 Add test for selects with variables am: b9519094d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3096217

Change-Id: Ia67752490a3cec0c8c8723c0655326131f4c4da9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 19:13:35 +00:00
Spandan Das
5f1f9405b5 Restrict validateApexClasspathFragments to active apex prebuilts
This is a followup to https://r.android.com/3073624 that moved
validation of bcp jars to the top-level prebuilt apex. It is possible
that there can be multiple prebuilt variants of a mainline module and
each prebuilt might have a skew in bcp jars. This CL limits the check to
only the selected apex prebuilt.

Test: go test ./apex
Bug: 328578801
Change-Id: If225a1af6004b6584b86ec442f99672f0d1f8314
2024-05-21 18:59:23 +00:00
Cole Faust
bc82eaf0f6 Remove printf in tests
This causes unnecessary spam when running
m nothing --no-skip-soong-tests.

Test: m nothing --no-skip-soong-tests
Change-Id: I4d893b3da47a9f79774c67274a84ff77be9c4811
2024-05-21 11:22:29 -07:00