Commit graph

83588 commits

Author SHA1 Message Date
Zi Wang
0bdf15d826 Merge "Use OutputFilesProvider on gen_notice" into main am: 7daabf71ef am: 4f974b408d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3118356

Change-Id: I1c8c2bee83bc7d2443abcc7a3e25325a8e89a4bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 03:16:17 +00:00
Zi Wang
4f974b408d Merge "Use OutputFilesProvider on gen_notice" into main am: 7daabf71ef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3118356

Change-Id: Ia870452db22ca1659504286c5da27ba4767562da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 02:53:22 +00:00
Zi Wang
7daabf71ef Merge "Use OutputFilesProvider on gen_notice" into main 2024-06-07 02:36:54 +00:00
Treehugger Robot
571737a9e2 Merge "release_config: Do not force ranking in inheritance graph" into main am: db664386ec am: 858705ec08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114840

Change-Id: I6da5cc45c736fe092ba131a429b2e71e2cdf352e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 01:41:04 +00:00
Treehugger Robot
858705ec08 Merge "release_config: Do not force ranking in inheritance graph" into main am: db664386ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114840

Change-Id: I783dd11bf097ab8ccc363863ef160a3ccec8d6b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 01:25:53 +00:00
Treehugger Robot
db664386ec Merge "release_config: Do not force ranking in inheritance graph" into main 2024-06-07 01:07:53 +00:00
Treehugger Robot
7a1af804d8 Merge "Drop IncludeTags" into main am: 211fdd6618 am: 98f7f32ba0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3098657

Change-Id: I83156dae3070ea13b5afa9ded2171100fedb9f1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 22:38:45 +00:00
Zi Wang
8de90afdba Merge "Initialize TaggedOutputFiles before updating it" into main am: aff9a2c7ac am: ceb7029f37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3118931

Change-Id: Ic5f2281148d9738fae56cc515ddf57097ee1ed6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 22:38:25 +00:00
mrziwang
1b25df0a01 Use OutputFilesProvider on gen_notice
Test: CI
Bug: 339477385
Change-Id: Iae2ff3a8017e8e073391afe648793424cc0eadbd
2024-06-06 15:20:42 -07:00
Treehugger Robot
98f7f32ba0 Merge "Drop IncludeTags" into main am: 211fdd6618
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3098657

Change-Id: I7bbd91db4f4309f8a8c0e558bf901a351ed20c24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 22:16:18 +00:00
Treehugger Robot
211fdd6618 Merge "Drop IncludeTags" into main 2024-06-06 22:12:38 +00:00
Zi Wang
ceb7029f37 Merge "Initialize TaggedOutputFiles before updating it" into main am: aff9a2c7ac
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3118931

Change-Id: I1ca3a5cf62bce15d4399b133548c358a8e82ec27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 22:08:22 +00:00
Zi Wang
aff9a2c7ac Merge "Initialize TaggedOutputFiles before updating it" into main 2024-06-06 21:54:15 +00:00
LaMont Jones
4bb19b2414 release_config: Do not force ranking in inheritance graph
Let graphvis decide how to best display the release config graph.
Also add some color to the graph.

Bug: None
Test: manual
Change-Id: If8b9eb41eb78bd553fd5543938a2c1c098b41591
2024-06-06 12:22:26 -07:00
mrziwang
57768d7437 Initialize TaggedOutputFiles before updating it
Test: CI
Change-Id: I176ec626ee4165af62344bf918b665d6414f6d83
2024-06-06 11:31:51 -07:00
Treehugger Robot
ef9fd50b23 Merge "Disallow unknown fields in soong variables file" into main am: 4eef64a70b am: 142cf7a304
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114140

Change-Id: I2b5e0f4615f90809a32e1a596dda4c30441dd7d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 18:29:17 +00:00
Treehugger Robot
142cf7a304 Merge "Disallow unknown fields in soong variables file" into main am: 4eef64a70b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114140

Change-Id: I79650c9d87247d91f9a33454a1ff7e3e3a7abeef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 18:07:14 +00:00
Treehugger Robot
4eef64a70b Merge "Disallow unknown fields in soong variables file" into main 2024-06-06 17:51:57 +00:00
Treehugger Robot
71d3e321ae Merge "Identify profile providing apexes using ApexInfo" into main am: 4039516f32 am: b9bc2f388a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114508

Change-Id: Ife75c0ad174a23f3c7ef593161ac85cd39d37369
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 01:41:27 +00:00
Treehugger Robot
b9bc2f388a Merge "Identify profile providing apexes using ApexInfo" into main am: 4039516f32
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114508

Change-Id: Iea4312baee09a9114748f008321050729e3e0b33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-06 01:25:52 +00:00
Treehugger Robot
4039516f32 Merge "Identify profile providing apexes using ApexInfo" into main 2024-06-06 01:10:12 +00:00
Spandan Das
7fd531f5d1 Identify profile providing apexes using ApexInfo
`com.android.art` and its overrides include a `etc/boot-image.prof`
which is used on device for profile guided dexopt.
```
$ deapexer list <path_in_product_out>/com.android.art.apex | grep
boot-image
$ deapexer list <path_in_product_out>/com.google.android.art.apex | grep
boot-image
```

To identify that we should include a boot-image.prof in the override
apexes, we currently look at ApexInfo.InApexVariants in the context of
art's bootclasspath fragment module. InApexVariants are colated based on
the min_sdk_version of the top-level apex. At ToT, we have a single
variant of `art-bootlcasspath-fragment` for aosp art apex, google art
apex and google go art apex.

When google go art apex overrides the min_sdk_version, ApexInfo is
cleaved, and two distinct variants of art-bootclasspath-fragment are
created. The one corresponding to go art apex does not know we should
include boot-image.prof

To fix this, use AllApexInfoProvider instead. If any of the apexInfos
corresponds to com.android.art, include etc/boot-image.prof

Test: Added a unit test
Test: With https://b.corp.google.com/issues/345173231#comment2 reverted,
m com.google.android.go.art && deapexer list <apex> # verified that
boot-image.prof exists

Bug: 345173231
Bug: 295311875

Change-Id: I5a0e8f74725388f05343c64f268260b1eb139ae5
2024-06-05 21:32:23 +00:00
Steven Moreland
ce78db081d Merge "Shipping_api_level in build." into main am: c562e50fe5 am: baaeddbdca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3112267

Change-Id: I28e5cff14a84bf6c5e79f9237ffa457ae660e56e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 20:00:38 +00:00
Steven Moreland
baaeddbdca Merge "Shipping_api_level in build." into main am: c562e50fe5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3112267

Change-Id: Ieae74f8a9f904cbdffd05ccc88bce407a25b703a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 19:36:09 +00:00
Steven Moreland
c562e50fe5 Merge "Shipping_api_level in build." into main 2024-06-05 19:23:20 +00:00
Adam Seaton
54988b4579 Merge "Change default version code for Mainline modules building from source to start with 3520" into main 2024-06-05 19:22:31 +00:00
Adam Seaton
3d530c24d7 Change default version code for Mainline modules building from source to start with 3520
BUG:344610650

Ignore-AOSP-First: We are currently blocked on internal testing of mainline modules by these version code issues, but are unclear if this is correct behavior for AOSP. We'd like to submit this in the interest of unblocking the testing, and will resolve the question in AOSP thereafter.

Change-Id: I64ddf6215ddfe33e180a54bf8a98092da8286808
2024-06-05 19:22:21 +00:00
Zi Wang
eb98cca569 Merge "Use OutputFilesProvider on bpf" into main am: 6c9fa02204 am: f1dbeb309e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3098157

Change-Id: Ide64637b755c457708c6ac802dab800064154233
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 16:46:14 +00:00
Zi Wang
f1dbeb309e Merge "Use OutputFilesProvider on bpf" into main am: 6c9fa02204
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3098157

Change-Id: I4a32747fc36aa90e19e5b8539100842e172aae69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 16:16:34 +00:00
Zi Wang
6c9fa02204 Merge "Use OutputFilesProvider on bpf" into main 2024-06-05 15:55:34 +00:00
mrziwang
e6c8581fbe Use OutputFilesProvider on bpf
This changes makes bpf module type uses OutputFilesProvider,
instead of current OutputFileProducer for inter-module-
communication.

Test: CI
Bug: 339477385
Bug: 342406930
Change-Id: I85d1141e9f6583cc5427756107da99f56b0c7ea1
2024-06-04 22:09:13 -07:00
LaMont Jones
815025897c Merge "Allow product-specific release configs." into main am: 7bd25635aa am: 67ca47524e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114839

Change-Id: Ib101604c92c131324dc7d6fd3c29f70a0020d379
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 00:38:28 +00:00
LaMont Jones
67ca47524e Merge "Allow product-specific release configs." into main am: 7bd25635aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114839

Change-Id: I95059f9a70ed7464aa9bde3aa268d0e74b569f56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-05 00:22:52 +00:00
LaMont Jones
7bd25635aa Merge "Allow product-specific release configs." into main 2024-06-05 00:07:28 +00:00
Cole Faust
023b487de9 Merge "genrule: Make cmd configurable" into main am: 3f7b73c639 am: e7c83d9f76
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3109961

Change-Id: I696722f467b791a58b6735034f292f723a3cb0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 23:54:46 +00:00
Cole Faust
e7c83d9f76 Merge "genrule: Make cmd configurable" into main am: 3f7b73c639
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3109961

Change-Id: I83900a6ea7491445c331c4e4a864b5ad7fe4833c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 23:39:53 +00:00
Cole Faust
3f7b73c639 Merge "genrule: Make cmd configurable" into main 2024-06-04 23:23:32 +00:00
Steven Moreland
a48df2b7fb Shipping_api_level in build.
Add shipping API level to build, so that we can move
certain tests to build time.

Bug: 340953047
Test: works in init for build time host checks
Change-Id: Ic89066c2b49089da3113a1afef1d39de53b307d9
2024-06-04 23:08:20 +00:00
Cole Faust
8052e38d31 Merge "Cleanup dirmods, outmod, and pathmod" into main am: 83838b6297 am: a2369869b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114379

Change-Id: I82fe93c9a86564b5fb464af831550fb11c74b31c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 22:50:32 +00:00
Cole Faust
a2369869b1 Merge "Cleanup dirmods, outmod, and pathmod" into main am: 83838b6297
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114379

Change-Id: I1b35fa283e3ed019ae9fd0bea6d5028030bc5349
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 22:21:45 +00:00
Treehugger Robot
b2e94a04a7 Merge "Ignore_max_page_size option." into main am: 2e264ce8e1 am: 932414b0ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3112601

Change-Id: I78aa7a107947eabc095e6eb32397dcb27640e120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 22:11:33 +00:00
Cole Faust
83838b6297 Merge "Cleanup dirmods, outmod, and pathmod" into main 2024-06-04 22:03:22 +00:00
Treehugger Robot
932414b0ad Merge "Ignore_max_page_size option." into main am: 2e264ce8e1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3112601

Change-Id: Id02367f2a210457d8fef0781dcfcb2f7c039fbe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 21:47:36 +00:00
Treehugger Robot
2e264ce8e1 Merge "Ignore_max_page_size option." into main 2024-06-04 21:29:47 +00:00
LaMont Jones
b4f866c73c Allow product-specific release configs.
Bug: 343794062
Test: manual
Change-Id: Ifdfab5978221f1396681a2c851bad7be502b6ea7
2024-06-04 14:27:07 -07:00
Cole Faust
da52d80b01 Make pathmod give absolute paths am: 5f2be11396 am: 32e6102832
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114319

Change-Id: I0f520dadf3eefee49cc878e997dc64eedf65259d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 20:51:36 +00:00
Cole Faust
32e6102832 Make pathmod give absolute paths am: 5f2be11396
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3114319

Change-Id: Ic2058bedb8357311a30c483a7d4d6d338a32ae87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-04 20:36:32 +00:00
Cole Faust
ec701ded12 Cleanup dirmods, outmod, and pathmod
- Use argparse for parsing
- Correct copy/pasted documentation
- Misc small tweaks

Bug: 340648588
Test: manually
Change-Id: I11373bd25712b6880517efbb7aefabf70d29a771
2024-06-04 12:30:55 -07:00
Cole Faust
5f2be11396 Make pathmod give absolute paths
This was broken when pathmod was turned into a standalone script.

Bug: 340648588
Test: gomod frameworks-minus-apex from build/soong
Change-Id: Ibd5eaf2c29d232c1a7da432723f7c6b6fa8bce83
2024-06-04 12:14:35 -07:00
Cole Faust
e1129b8cc6 Disallow unknown fields in soong variables file
To catch issues earlier, like when renaming a field.

Test: Presubmits
Change-Id: Ie04507b54cc8de3efd27ee75ff32a85ea21b5750
2024-06-04 11:10:11 -07:00