Commit graph

8277 commits

Author SHA1 Message Date
Treehugger Robot
4a5c2cdbdb Merge "Cleanup ImageInterface.SetImageVariation" into main am: 77858402e4 am: d3ba5a3f6e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131759

Change-Id: I8d682d5bed835d8a56a9595bf910bafb194d29ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 04:35:31 +00:00
Treehugger Robot
d3ba5a3f6e Merge "Cleanup ImageInterface.SetImageVariation" into main am: 77858402e4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131759

Change-Id: I4504623d0978356eb7f3b526d01ffb99abd0da12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-14 04:29:12 +00:00
Jihoon Kang
7583e835f7 Cleanup ImageInterface.SetImageVariation
This change modifies the interface method of
ImageInterface.SetImageVariation so that the image variation is set
directly at the caller image variation module, instead of passing the
pointer to set the image variation.

Test: m nothing
Change-Id: I8eadb5149365530243e19a8cd37eb49d335fbeef
2024-06-13 21:56:23 +00:00
Jihoon Kang
789a53f28c Merge "Remove exportable modules when generating snapshots targeting older platform" into main am: 0030148fcb am: 871393aa37
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3119791

Change-Id: I983606933284aa221a7d96e40a132d21a5eae26c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-10 21:30:51 +00:00
Jihoon Kang
871393aa37 Merge "Remove exportable modules when generating snapshots targeting older platform" into main am: 0030148fcb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3119791

Change-Id: I12200b4516475e10351eb8d7703370eff96e2c4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-10 21:00:58 +00:00
Jihoon Kang
0030148fcb Merge "Remove exportable modules when generating snapshots targeting older platform" into main 2024-06-10 20:46:09 +00:00
Jihoon Kang
98aa8fa840 Remove exportable modules when generating snapshots targeting older platform
This change modifies the contents of the generated Android.bp files so
that when generating a snapshot on a older platform, the "exportable"
modules are removed from the bp files, as the "exportable" modules are
first introduced in V and do not exist in older platforms.

Bug: 345162614
Test: ABTD
Change-Id: I2dba51b98deec7805bd796647a66981f237c55a9
2024-06-10 18:12:35 +00:00
Treehugger Robot
0ab1981a60 Merge "Make buildinfo_prop a regular module" into main am: 63de06c142 am: 75f22c3f9c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3118355

Change-Id: Ie5a98b2ceebcb6579e86cd4ddc34b96b8da45ee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 19:20:57 +00:00
Treehugger Robot
75f22c3f9c Merge "Make buildinfo_prop a regular module" into main am: 63de06c142
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3118355

Change-Id: I75bf5b9b60de08fad3fb298be985b71d5c6578e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 18:56:31 +00:00
Treehugger Robot
63de06c142 Merge "Make buildinfo_prop a regular module" into main 2024-06-07 18:36:54 +00:00
Cole Faust
b5ba56fbe8 Merge "Make buildinfo_prop depend on build number file" into main am: daba74e728 am: a256b1a485
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3118317

Change-Id: Ief03d30685967222aec75c512c039077d850322b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 18:05:36 +00:00
Cole Faust
a256b1a485 Merge "Make buildinfo_prop depend on build number file" into main am: daba74e728
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3118317

Change-Id: Ie2384c5cca28355b3a10ec42514a5db965e7b0b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-06-07 17:40:56 +00:00
Cole Faust
daba74e728 Merge "Make buildinfo_prop depend on build number file" into main 2024-06-07 17:27:27 +00:00
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
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
Cole Faust
a700d7fa9f Make buildinfo_prop a regular module
Singleton modules have the capability to do a lot more than regular
modules, which is often problematic for incremental builds.
buildinfo_prop wasn't using those capabilities, so make it a regular
module type to prove it.

Bug: 332733525
Test: m out/target/product/emu64x/obj/ETC/buildinfo.prop_intermediates/buildinfo.prop
Change-Id: I288bf2fd4727a17ff299272d4cfcc611e064c55a
2024-06-06 14:49:23 -07:00
Cole Faust
89b4d18ba1 Make buildinfo_prop depend on build number file
buildinfo.prop should be rebuilt when the build number file changes,
because it needs to contain the up to date build number as well.

When this was implemented in make, that dependency was added. But when
we converted it to soong, it was removed. (aosp/3015794 and
aosp/3015818)

Fixes: 332733525
Test: m out/target/product/emu64x/obj/ETC/buildinfo.prop_intermediates/buildinfo.prop repeatedly, see that it rebuilds
Change-Id: Ife9bfa7d48f2578984761f0a78eda3513b324298
2024-06-06 14:39:32 -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
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
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
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
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
Kiyoung Kim
8f05c54b9d VNDK is fully deprecated from Soong
VNDK is fully deprecated, so KeepVndk variable will have fixed value.
This change removes KeepVndk config value, and updates any logic using
the value as VNDK is always deprecated.

Bug: 330100430
Test: Soong tests passed
Ignore-AOSP-First: Resolve merge conflict
Change-Id: I98b7590c059883e06bf3fb236d88966de64991d7
Merged-In: I98b7590c059883e06bf3fb236d88966de64991d7
2024-06-04 01:09:15 +00:00
Kiyoung Kim
48ebc86a8f Merge "VNDK is fully deprecated from Soong" into main 2024-06-04 00:48:12 +00:00
Alyssa Ketpreechasawat
fbce223d34 Merge "Add RELEASE_APEX_CONTRIBUTIONS_TELEMETRY_TVP build flag" into main am: 4aff462533 am: 54ddc87436
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3106710

Change-Id: I09212467bf67692c6571ef1f4bb59e4cc5001895
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 08:47:08 +00:00
Alyssa Ketpreechasawat
54ddc87436 Merge "Add RELEASE_APEX_CONTRIBUTIONS_TELEMETRY_TVP build flag" into main am: 4aff462533
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3106710

Change-Id: I63c312ed4a451e108319fdeda87d5b7fe1271c00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-31 08:39:18 +00:00
Alyssa Ketpreechasawat
4aff462533 Merge "Add RELEASE_APEX_CONTRIBUTIONS_TELEMETRY_TVP build flag" into main 2024-05-31 08:36:43 +00:00
Alyssa Ketpreechasawat
dcda1c8906 Add RELEASE_APEX_CONTRIBUTIONS_TELEMETRY_TVP build flag
Bug: 342624660
Test: check com.google.mainline.go.telemetry_tplus in out/soong/prebuilt_info.json (go target)
Change-Id: I201b58c08772669b54c396b4c4dbeccbb4b5147c
2024-05-30 20:24:29 +00:00
Spandan Das
08cbaf8156 Handle missing apex_contributions am: a866713ddb am: 57c5b49a65
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3107540

Change-Id: Ib9b632ce85d7dab888fe9a587566c5678ac519cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-30 19:18:08 +00:00
Spandan Das
57c5b49a65 Handle missing apex_contributions am: a866713ddb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3107540

Change-Id: I57c743f75192f1f8cd3e39720cade587f97fbb8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-30 19:12:21 +00:00
Spandan Das
a866713ddb Handle missing apex_contributions
Some minimal branches have v/g_s/build/release (where apex_contibutions
have been set to mainline prebuilts), but not v/g/b (where the apex_contributions
for prebuilts have been defined). These minimal branches are unsuitable
for building a product that consume mainline prebuilts, but they would
still like to do aosp product builds.

aosp products should not use the mainline prebuilts anyways, but this
has been implemented as
- always create the dependency edge to the selected apex contributions
- do not visit the dependency edge subsequently if
  IgnoreApexContributions is set set to true

To support aosp product builds in minimal branches, this CL updates the
implementation to skip creating the dependency edge when
IgnoreApexContributions is set to true

Test: go test ./android
Change-Id: Iaa0971760e64f9b7a03542f179231ce2268b6616
2024-05-30 16:51:51 +00:00
Kiyoung Kim
97974dfa04 VNDK is fully deprecated from Soong
VNDK is fully deprecated, so KeepVndk variable will have fixed value.
This change removes KeepVndk config value, and updates any logic using
the value as VNDK is always deprecated.

Bug: 330100430
Test: Soong tests passed
Ignore-AOSP-First: Resolve merge conflict
Change-Id: I98b7590c059883e06bf3fb236d88966de64991d7
2024-05-30 10:15:17 +09:00
Spandan Das
844de9d480 Merge "Override modules should always override source modules" into main am: 2f9af23734 am: e0063f7f10
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3106441

Change-Id: I3344c16f7cff3c5a2a763493536c92bd18e48f44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 22:58:22 +00:00