Commit Graph

83298 Commits

Author SHA1 Message Date
Cole Faust
82bdeba837 Merge "Support soong config value variables on Configurable properties" into main am: c15b0234e9 am: 341d2f51ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3097980

Change-Id: Ibdf179121877bafd0862194d5d66e55fb2977c43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 00:36:38 +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
Treehugger Robot
5231182f1d Merge "Restrict validateApexClasspathFragments to active apex prebuilts" into main am: 5458a8437d am: abd52ea70b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3096218

Change-Id: I4aea843bad723a411050373728f5e178afa9601c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 00:03:32 +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
2bc0635442 Merge "Generate specific message for build flag declarations artifact" into main am: aae7c4a302 am: 3fa8274e1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3097877

Change-Id: Ic59565f14f69b5a45da04dfded50e7d04ad08e13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 22:57:27 +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
20602731de Merge "Instrument impl library belonging to apexes" into main am: b07e7fd542 am: 18f487824f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3095998

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

Change-Id: I8d1e3f451a34f95c66b72f427dcef4b52596189f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 19:26:02 +00: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
b032d2d4b6 Merge "Log warnings to stdout instead of stderr" into main am: a642853510 am: 86a72c2ab7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3094711

Change-Id: I60d743fe4a90fb487c045cd5d407366f9a56df18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 18:11:56 +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
e80e249acd release_config_proto: revert enum rename am: 44789260ad am: d321b211bc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3093316

Change-Id: Ide9c1d56494ff9c4f4fd1a4345067d445fb945ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 15:19:49 +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
bbae8cd08f Merge "Export release flag types to make/soong" into main am: d7b71490ae am: 1835d95d99
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3094709

Change-Id: I21663e369aa758dd3eb03cf5d1a53a3b15347127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 02:58:10 +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
6829653f52 Merge "Better errors from build-flag" into main am: 423b8f6869 am: abac6e35f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3094708

Change-Id: If54cfc04c4395c330f2c74ac83d270ce4c912445
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 02:33:03 +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
6c5e35e5df Merge "implement InstallDepNeeded for sdkLibraryComponentTag" into main am: 1bd60b7c79 am: 479452bfe0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3095012

Change-Id: I306682cf799f81d2bbdd50bce34ba0ed8ce36b80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 01:49:27 +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
a2f9e9a882 Merge changes I6b1d6dcd,I97eb864e,I155c26b1 into main am: 1ab18fc547 am: 1415729eea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3092860

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

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

Change-Id: If7565504e003e6b53123aa6490b7a7ab42a55b4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 00:36:59 +00: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
9c1b5f83ef Merge "Make dirs a configurable property" into main am: 5c04707a3f am: ad0a9f4bed
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3094914

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

Change-Id: Ic42d4c86886f5d27158c3e5fa9f5a767028b162d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 23:34:48 +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