Commit Graph

8274 Commits

Author SHA1 Message Date
Cole Faust
5fda87b822 Keep replace_instead_of_append in arch prop structs
replace_instead_of_append is read by proptools.ExtendProperties() /
proptools.ExtendMatchingProperties(). These functions are called on
arch property structs, so we need to preserve it when creating the
arch property structs.

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: Ic08704d8a2b710f5a5d99b62d3f8a37730bb6013
2024-04-24 11:21:14 -07:00
Weijia He
eb094df68e Merge "Generate test lists for Ravenwood and Robolectric tests" into main am: 3835928537 am: 4feb4f8a32
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3049132

Change-Id: I98b5ebdd34d09157b20eafb4d1eaecda2bc05e1c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 23:27:04 +00:00
Weijia He
4feb4f8a32 Merge "Generate test lists for Ravenwood and Robolectric tests" into main am: 3835928537
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3049132

Change-Id: If8ccad1761ee6f44315a4dacab52bed6ed6431ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 23:16:47 +00:00
Weijia He
3835928537 Merge "Generate test lists for Ravenwood and Robolectric tests" into main 2024-04-23 22:54:37 +00:00
Treehugger Robot
18b5ba516d Merge "Add support to Soong config list variable" into main am: d47220d470 am: 75195eea85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3029263

Change-Id: I16ea8f07abc5a23c297cc4249a61d68923162c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 01:44:35 +00:00
Treehugger Robot
75195eea85 Merge "Add support to Soong config list variable" into main am: d47220d470
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3029263

Change-Id: Ic59f2fd2ac5624c2b7e8bd5990d62511b1164485
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-23 01:34:27 +00:00
Treehugger Robot
d47220d470 Merge "Add support to Soong config list variable" into main 2024-04-23 01:14:44 +00:00
Colin Cross
11b932a007 Merge "Remove more unused code" into main am: a17792e2eb am: 2d67bcba1d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3038267

Change-Id: I2a46afceeb90cd80596037212eedf8a2b230711f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 19:25:35 +00:00
Colin Cross
19cdb7acf0 Merge "Convert apex mutator to a TransitionMutator" into main am: 757e88a9df am: c955bda138
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3042819

Change-Id: I6a986963f5e18b21668670fe600302d2d6af9447
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 19:25:22 +00:00
Colin Cross
2d67bcba1d Merge "Remove more unused code" into main am: a17792e2eb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3038267

Change-Id: I2059c16492fa27e4a4a93518ef69a45a4f655f01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 19:05:25 +00:00
Colin Cross
c955bda138 Merge "Convert apex mutator to a TransitionMutator" into main am: 757e88a9df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3042819

Change-Id: I8f0f3cde2f543007e4971c4a43cd5af5051b308b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-22 19:04:56 +00:00
Colin Cross
a17792e2eb Merge "Remove more unused code" into main 2024-04-22 18:50:08 +00:00
Colin Cross
757e88a9df Merge "Convert apex mutator to a TransitionMutator" into main 2024-04-22 18:32:22 +00:00
Inseob Kim
02c8618e1b Add support to Soong config list variable
List variables act similar to value variables. Each value in a list
variable will be added to a list property after string substitution.

Bug: 329208946
Test: m --no-skip-soong-tests
Test: m selinux_policy_system_soong
Change-Id: I1127bfb0798e7e5f7d665f647307224d5ff5d790
2024-04-22 14:51:07 +09:00
Weijia He
299d62dd51 Generate test lists for Ravenwood and Robolectric tests
Modify the Ravenwood and Robolectric test suite packaging rules to output a zip file containing the list of test modules contained in the suite.

This is required for supporting Test Mapping with these suites. More specifically, Test Mapping infrastructure uses the test list to determine whether any of the configured TEST_MAPPING file entries reference test modules included in the suite.

Bug: 333895151
Change-Id: I4cb2ff70c799c1c3064c96e04fad11ff0694f51a
Test: m nothing --no-skip-soong-tests
Test: m ravenwood-tests robolectric-tests
Signed-off-by: Weijia He <hwj@google.com>
2024-04-19 23:10:35 +00:00
Spandan Das
8364694ad6 Merge "Drop use_source_config_var from prebuilt selection" into main am: 2182c08f3e am: bf3c77cfc5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3048855

Change-Id: Ide20f4d36d90791ec7c137f51f03ab8b72ee80ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-19 19:35:14 +00:00
Spandan Das
bf3c77cfc5 Merge "Drop use_source_config_var from prebuilt selection" into main am: 2182c08f3e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3048855

Change-Id: I23f934f95d3211a81131820ed2b4afdb15e89e60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-19 19:03:45 +00:00
Spandan Das
2182c08f3e Merge "Drop use_source_config_var from prebuilt selection" into main 2024-04-19 18:44:28 +00:00
Treehugger Robot
eaf1311e1a Merge "Prefer variants test-only:true attribute when grouping." into main am: 1f0aeb0644 am: fe3c401435
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3045317

Change-Id: I50da55fd8bb3759fa16e1d004c275c64010e8e3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-19 03:56:30 +00:00
Treehugger Robot
fe3c401435 Merge "Prefer variants test-only:true attribute when grouping." into main am: 1f0aeb0644
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3045317

Change-Id: Iada33f8e4b81837a7fa31c87623a6f6a1c340904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-19 03:38:29 +00:00
Ronald Braunstein
c864b242da Prefer variants test-only:true attribute when grouping.
When looking at more details of modules that are marked test-only, I saw
that `java_test_host` modules were not in the list.

The test I wrote for it passes, but in a real run, there are two variants (one
windows, one linux) which causes it to fail.  The `all_teams` code visis
all variants, even not enabled ones. The windows variant, for which
GenerateAndroidBuildActions was not being called, did not have a
provider and its empty data was overriding the variant for which we had
data.

I changed the code to prefer variants where it is true.
Generally for "test-only", the value is logically true independent of variant, so
if one variant sets it true, it should be considered true for all
variants.
I think this is a slightly better check than preferring a variant with a
provider or that is enabled.

Prev CL
       % gqui from  "flatten(~/aosp-main-with-phones/out/soong/ownership/all_teams.pb, teams)" proto team.proto:AllTeams 'select teams.kind, count(*) where teams.test_only = true and teams.kind not like "%cc_%" group by teams.kind'
        +--------------------------+----------+
        |        teams.kind        | count(*) |
        +--------------------------+----------+
        | android_test             |     1382 |
        | android_test_helper_app  |     1680 |
        | java_fuzz                |        5 |
        | java_test                |      774 |
        | java_test_helper_library |       29 |
        +--------------------------+----------+

After
	 gqui from  "flatten(~/aosp-main-with-phones/out/soong/ownership/all_teams.pb, teams)" proto ~/aosp-main-with-phones/build/soong/android/team_proto/team.proto:AllTeams ' select teams.kind, count(*) where teams.test_only = true and teams.kind not like "%cc_%" group by teams.kind'
	+--------------------------+----------+
	|        teams.kind        | count(*) |
	+--------------------------+----------+
	| android_test             |     1382 |
	| android_test_helper_app  |     1680 |
	| csuite_test              |       16 |
	| java_fuzz                |       10 |
	| java_test                |      774 |
	| java_test_helper_library |       35 |
	| java_test_host           |      495 |
	+--------------------------+----------+

Test: go test ./android
Test: m all_teams
Test: m blueprint_tests
Change-Id: Idc5ed1c0375dc7390a0d58fcb4bf0d7fe1c7ab4f
2024-04-18 15:56:54 -07:00
Spandan Das
7e674e69ef Drop use_source_config_var from prebuilt selection
This CL makes this property a no-op from the perspective of prebuilt
selection. The primary user of this was mainline modules, but they have
now switched to RELEASE_APEX_CONTRIBUTIONS_* for prebuilt selection,
both for internal `main` development and in partner drops.

Test: in internal, lunch cf_x86_64_phone-next-userdebug; m nothing; and
verified there was a path to the prebuilt bt apex

Test: in partner workspace, lunch gsi_partner_arm-ap31-userdebug; m
nothing; and verified that there was a path to the prebuilt adservices apex

Bug: 308188211
Change-Id: I124a6dada5c20aca4bdebf70dcbe5bbec28cefbe
2024-04-18 22:35:42 +00:00
Colin Cross
7c035064db Convert apex mutator to a TransitionMutator
Replace the apex mutator with a TransitionMutator.  Requires moving the
base.apexInfo value into a provider so that it is still present for the
Mutate pass.

Test: go test ./...
Test: no change to out/soong/build-${TARGET_PRODUCT}.ninja
Change-Id: I1c898eaf30b4021f0f96f439cc0b3b3173710fc7
2024-04-18 15:08:43 -07:00
Treehugger Robot
eb513a47fd Merge "Revert^2 "Use Module interface in addRequiredDeps"" into main am: e25cc5c909 am: 089d16cf13
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3046212

Change-Id: I01fb17991dde1eb40c1ec4e7ebc3b0b68aa14c8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 23:07:08 +00:00
Treehugger Robot
089d16cf13 Merge "Revert^2 "Use Module interface in addRequiredDeps"" into main am: e25cc5c909
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3046212

Change-Id: Icd7351d8c3261e093860880dda71fc718b07d4c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 22:55:06 +00:00
Treehugger Robot
e25cc5c909 Merge "Revert^2 "Use Module interface in addRequiredDeps"" into main 2024-04-17 22:37:56 +00:00
Jihoon Kang
17eca3bcf8 Merge "Unify the behaviors of Shard*(...) utility functions" into main am: 48a01ad142 am: 59bdf12d26
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3037575

Change-Id: I0c8650a7ff10bdba87e909ebed67019c91190113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 18:08:04 +00:00
Jihoon Kang
59bdf12d26 Merge "Unify the behaviors of Shard*(...) utility functions" into main am: 48a01ad142
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3037575

Change-Id: I4943eef93a649ea82c1032a3ef8c5770331abe00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 17:43:08 +00:00
Jihoon Kang
48a01ad142 Merge "Unify the behaviors of Shard*(...) utility functions" into main 2024-04-17 17:21:02 +00:00
Jiyong Park
f21dd65c08 Revert^2 "Use Module interface in addRequiredDeps"
This reverts commit bbcdaa0c32.

Reason for revert: relanding with a forward fix

Change-Id: I14b83010a4b8d9cb9cb317f2aa07875c17f6cdaa
2024-04-17 05:22:37 +00:00
Daren Liao
3ccb316ee7 Merge "Revert "Use Module interface in addRequiredDeps"" into main am: 5ff02b5005 am: bb3a6d4fee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3046092

Change-Id: Ibb87313cd5e7e43623ddfd7ed3db1bcb867fa78d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 04:10:32 +00:00
Daren Liao
bb3a6d4fee Merge "Revert "Use Module interface in addRequiredDeps"" into main am: 5ff02b5005
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3046092

Change-Id: I84705d68d2cd69310d0614bfc72a9ed0f8505ab9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 03:45:23 +00:00
Daren Liao
5ff02b5005 Merge "Revert "Use Module interface in addRequiredDeps"" into main 2024-04-17 03:28:48 +00:00
Daren Liao
bbcdaa0c32 Revert "Use Module interface in addRequiredDeps"
This reverts commit de18a3d55a.

Reason for revert: b/335332155

Change-Id: Ib5b74b1704c1446713466e8617c42b212c960d49
2024-04-17 03:07:53 +00:00
Treehugger Robot
c860d063a3 Merge "Change the syntax for arch selecting and add os selecting" into main am: 4e1cf60c15 am: 4778e1cba2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3039967

Change-Id: I00c84e55b94b412381636a7f146846dfd683d632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 00:33:23 +00:00
Jihoon Kang
cd5bfe2bf1 Unify the behaviors of Shard*(...) utility functions
This change introduces a generic version of Shard*(...) utility
functions to prevent future digressions of the methods.

Test: m nothing --no-skip-soong-tests
Change-Id: I825214f0d79fb0549573ce01f298eea5eb87cf17
2024-04-17 00:32:48 +00:00
Treehugger Robot
4778e1cba2 Merge "Change the syntax for arch selecting and add os selecting" into main am: 4e1cf60c15
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3039967

Change-Id: Id23dc928e1aa2750114758accc7b82f56799db98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-17 00:15:45 +00:00
Treehugger Robot
4e1cf60c15 Merge "Change the syntax for arch selecting and add os selecting" into main 2024-04-16 23:50:12 +00:00
Jiyong Park
1cfc843d00 Merge "Use Module interface in addRequiredDeps" into main am: 8f8b695f6f am: 8fe5ec78f0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3039155

Change-Id: I8e9b2b89a3ddbbe541c86e4c86cb36b986a114b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 23:48:53 +00:00
Jiyong Park
8fe5ec78f0 Merge "Use Module interface in addRequiredDeps" into main am: 8f8b695f6f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3039155

Change-Id: I022a14b3b26ae9eaa5eea9b52ae6f34abdc262b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 23:31:01 +00:00
Treehugger Robot
01bb63b800 Merge changes I4a044e86,Ibf8b0feb,I2e1d7ac7,Icc61f2c3 into main am: 2b11ced7cc am: 7e480dce56
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3042818

Change-Id: I7e77a19a91fc17837dfea63fba4a35aa3d839581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 23:17:08 +00:00
Jiyong Park
8f8b695f6f Merge "Use Module interface in addRequiredDeps" into main 2024-04-16 23:13:06 +00:00
Treehugger Robot
7e480dce56 Merge changes I4a044e86,Ibf8b0feb,I2e1d7ac7,Icc61f2c3 into main am: 2b11ced7cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3042818

Change-Id: I80460545a54aad0158169e9459a8b53260a3292b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 22:59:06 +00:00
Treehugger Robot
2b11ced7cc Merge changes I4a044e86,Ibf8b0feb,I2e1d7ac7,Icc61f2c3 into main
* changes:
  Remove sort from mergeApexVariations
  Support reading Providers from TransitionMutator IncomingTransition and OutgoingTransition
  Set DebugMutators and DebugVariations when creating Transition variations
  Fix more tests when ANDROID_BUILD_TOP is set
2024-04-16 22:25:31 +00:00
Colin Cross
9132ced405 Remove sort from mergeApexVariations
Remove the sort from mergeApexVariations, and instead sort before
calling it as sorting will break the next change that calls
mergeApexVariations on a provider field that must not be modified.

Also remove the unused ctx PathContext parameter, and use
slices.SortFunc.

Bug: 319288033
Test: Test_mergeApexVariations
Change-Id: I4a044e86a8eb262b54af50afe14c678616c499d1
2024-04-16 14:09:36 -07:00
Cole Faust
48f1a1ff10 Merge "Update the ConfigurableEvaluator for typed selects" into main am: 1a8906d938 am: b18cd2f2d6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3037517

Change-Id: I680533986bbfd21cd4d2d1b6f26fc626ddcf1035
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 18:52:24 +00:00
Cole Faust
b18cd2f2d6 Merge "Update the ConfigurableEvaluator for typed selects" into main am: 1a8906d938
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3037517

Change-Id: I8732516b695ce343fa55419709d8900eebdba86c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-04-16 18:27:41 +00:00
Cole Faust
1a8906d938 Merge "Update the ConfigurableEvaluator for typed selects" into main 2024-04-16 18:09:59 +00:00
Colin Cross
af333f5aed Support reading Providers from TransitionMutator IncomingTransition and OutgoingTransition
Add a provider method to IncomingTransitionContext and
OutgoingTransitionContext so they implement ModuleProviderContext
and can be passed to android.ModuleProvider.

Bug: 319288033
Test: go test ./...
Change-Id: Ibf8b0feb78e4062fc044c321a23adcb68373e2f8
2024-04-16 09:32:24 -07:00
Colin Cross
d67425d763 Set DebugMutators and DebugVariations when creating Transition variations
DebugMutators and DebugVariations are set by CreateVariations, but
TransitionMutators don't call CreateVariations.  Set them in
TransitionMutators.Mutate instead.

Bug: 319288033
Test: go test ./...
Change-Id: I2e1d7ac7a04f1ae669602f6c0642cfa5333ada3c
2024-04-16 09:32:24 -07:00