Commit Graph

81976 Commits

Author SHA1 Message Date
Inseob Kim
4b45338a9d Merge changes from topic "logtags_filesystem_module" into main am: 53507d1559
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066502

Change-Id: I047402199b93062de23b5f4c3dfa9f4bec6fc018
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 11:39:06 +00:00
Inseob Kim
53507d1559 Merge changes from topic "logtags_filesystem_module" into main
* changes:
  Add logtags support to filesystem module
  Export app's logtags too
2024-05-03 11:20:12 +00:00
Paul Duffin
5175694880 Correct lint error when it cannot find api_versions_* module am: 375acd8def
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3071643

Change-Id: I5f13f890df3e692bcfba30ef4a43044a9929345d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 10:01:35 +00:00
Paul Duffin
375acd8def Correct lint error when it cannot find api_versions_* module
Also, fixes the error when it cannot find a module containing the
`annotations.zip` file.

Bug: 336993217
Test: change `apiVersionsModule` setting in `lint.go` to refer to
      a non-existent module and then run `m nothing` to see the
      error message correctly lists the module name.
Change-Id: I84a9e241d1c3bedebc26e119bd4b9861664c43c1
2024-05-03 09:37:42 +01:00
Inseob Kim
e33423dfc2 Merge "Merge logtags from cc modules too" into main am: 364740b4a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3064842

Change-Id: Ieddffdcc945c279ed06f9475db034854cf057702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 05:31:46 +00:00
Inseob Kim
364740b4a4 Merge "Merge logtags from cc modules too" into main 2024-05-03 05:10:22 +00:00
Florian Mayer
58fc120d50 Merge "Make memtag_stack a variant" into main am: 37d17209b2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3017681

Change-Id: Ied07f1a65bb6270da5214e41896c802bf426014f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 00:37:37 +00:00
Florian Mayer
37d17209b2 Merge "Make memtag_stack a variant" into main 2024-05-03 00:20:37 +00:00
Treehugger Robot
1b9335ea98 Merge "release-config: use ${TARGET_RELEASE} for output" into main am: 0cc2749a4f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3073550

Change-Id: Id35e20cf2995792bfbc3f1be2aafca8ae4842a20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 23:46:41 +00:00
Treehugger Robot
0cc2749a4f Merge "release-config: use ${TARGET_RELEASE} for output" into main 2024-05-02 23:24:32 +00:00
Colin Cross
c5216a798a Merge changes from topic "replace_dependencies" into main am: 814e80038b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070706

Change-Id: I559771ff5278db17095967f8bd582bb0fa906413
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 23:16:16 +00:00
Colin Cross
6e2dde355a Update docs for ReplaceDependencies[If] am: 86771326fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070705

Change-Id: I89b7a338eb20eff2034d3b4acc698bbbb21aa299
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 23:16:13 +00:00
Colin Cross
27c137509f Raise test timeout when running soong tests with race detector am: 55f169abaa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070704

Change-Id: I54f0f4eb7c9c53888a1d067f03375b3a0abafff2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 23:16:11 +00:00
Colin Cross
814e80038b Merge changes from topic "replace_dependencies" into main
* changes:
  Only update DebugMutator and DebugVariation for non-empty transition variations
  Update docs for ReplaceDependencies[If]
  Raise test timeout when running soong tests with race detector
2024-05-02 22:50:28 +00:00
LaMont Jones
897ab4e087 release-config: use ${TARGET_RELEASE} for output
When the passed release name is an alias, write
release_config-PRODUCT-RELEASE.mk using the alias, since that is where
core/release_config.mk is going to look for it.

Bug: 328495189
Test: manual
Change-Id: I4e6909f43bf136974323754e06fa538e39e0faab
2024-05-02 15:19:18 -07:00
Colin Cross
86771326fe Update docs for ReplaceDependencies[If]
Update docs for ReplaceDependencies[If] to match changes in blueprint.

Bug: 319288033
Flag: NONE
Test: all soong tests pass
Change-Id: I7c79d3ac8dd80946760eb89b6577dc9965cb1541
2024-05-02 14:39:40 -07:00
Colin Cross
888046f053 Only update DebugMutator and DebugVariation for non-empty transition variations
Non-transition mutators that don't create a variant for a given module
cause no change to DebugMutator and DebugVariation.  TransitionMutators
don't have a concept of skipping a module, so Mutate is called on
every module.  This causes extra entries in DebugMutator and DebugVariation,
which will confuse error message around missing variations, and require
updating variant strings in some tests.

Skip updating DebugMutator and DebugVariation for empty transition
mutator variations.  This isn't entirely correct, but transition mutators
don't currently have a concept of an unaffected module.

Bug: 319288033
Test: all soong tests pass
Flag: NONE
Change-Id: Ia4e659b1e90ffe4320074c9b49528d00fa302c6a
2024-05-02 14:39:40 -07:00
Cole Faust
6c87a53771 Merge "Reapply "Make the enabled property configurable"" into aosp-main-future 2024-05-02 20:57:30 +00:00
LaMont Jones
c102478777 Merge changes from topic "lamont-flagging-flags" into main am: 01bd5b1ddf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3068787

Change-Id: I94d6a4ddc35300f20f642cde4d54aa33c6ef0fcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 19:55:44 +00:00
LaMont Jones
24135647e7 Guard with RELEASE_BUILD_FLAGS_IN_PROTOBUF am: 15902f2f4c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070162

Change-Id: Ib1466bc31b9eef15edd6ce1d0f4e4e3d7bf2b0a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 19:55:39 +00:00
LaMont Jones
01bd5b1ddf Merge changes from topic "lamont-flagging-flags" into main
* changes:
  RELEASE_ACONFIG_VALUE_SETS is a reserved flag
  Guard with RELEASE_BUILD_FLAGS_IN_PROTOBUF
2024-05-02 19:51:00 +00:00
Treehugger Robot
832dfa8b76 Merge changes I439179a9,I8ad68f0d into main am: a73c4021ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3069684

Change-Id: Iaf1c0e80bfb13de39a07a5bc394af7289646bbd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 18:21:28 +00:00
Aditya Kumar
caaf53d286 Merge "IsEnvTrue and IsEnvFalse should take True and False as valid values respectively." into main am: c9b4d4c584
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070703

Change-Id: I71a0c74e961171b74dc3870aed6428f60b38ff18
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 18:21:15 +00:00
Cole Faust
275f3c24a5 Merge "cc: Remove exclude_header_libs from export_header_lib_headers" into main am: dbd91b0323
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3069302

Change-Id: I51580f2b1b2e57db9d68b0c1624dddd53a840991
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 18:19:55 +00:00
Treehugger Robot
a73c4021ec Merge changes I439179a9,I8ad68f0d into main
* changes:
  Add pattern to match android-plus-updatable.jar
  Clean up apiLevelsGenerationFlags deps gathering
2024-05-02 18:17:08 +00:00
Aditya Kumar
c9b4d4c584 Merge "IsEnvTrue and IsEnvFalse should take True and False as valid values respectively." into main 2024-05-02 18:14:59 +00:00
Cole Faust
dbd91b0323 Merge "cc: Remove exclude_header_libs from export_header_lib_headers" into main 2024-05-02 17:58:59 +00:00
Cole Faust
021bf3d973 Reapply "Make the enabled property configurable"
Previously, I had changed some loadhook-appended property structs
to use selects instead of the "target" property struct. This seems
to not be exactly equivalent because "target" properties are merged
with the regular properties later, at the time the arch mutator runs.

With this reapplication, leave those target property structs alone
to avoid breakages, but I'll have to look into what the issue is
with them later.

This reverts commit ed5276f082.

Ignore-AOSP-First: This cl needs to be in a topic with internal-only projects, will cherrypick to aosp after.
Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: If355d24506e3f117d27b21442a6c02bca3402dc7
2024-05-02 10:56:36 -07:00
Cole Faust
0d23a5c892 Merge "Add aosp-first preupload hook to soong" into main am: bf67b542aa
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070710

Change-Id: Id45646131e0474c7a62e43bdac80f78ba3f9a617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 17:47:45 +00:00
Cole Faust
bf67b542aa Merge "Add aosp-first preupload hook to soong" into main 2024-05-02 17:28:44 +00:00
Paul Duffin
5a195f40a0 Add pattern to match android-plus-updatable.jar
Change https://r.android.com/3068903 adds some extra
`android-plus-updatable.jar` files in `module-lib` and `system-server`
directories of API versions 30 through 34 in `prebuilts/sdk`. This
change modifies the build to pass those files, along with appropriate
`--android-jar-pattern` options to Metalava so it can use them when
generating `api-versions.xml` files for the different API surfaces.

The extra patterns are only passed when `extension_info_file` is
specified as there is no point in including the updatable modules that
contribute to SDK extensions without providing information about the
SDK extensions as well.

Bug: 337836752
Test: See https://r.android.com/3068903
Change-Id: I439179a9d35a4bb677e3bf87a3aea4a983724534
2024-05-02 17:33:02 +01:00
Paul Duffin
2ced2eb07f Clean up apiLevelsGenerationFlags deps gathering
Restructures the code a little to make it clear that extensions
directories are distinct from dessert release directories.

Bug: 337836752
Test: m --no-skip-soong-tests nothing
Change-Id: I8ad68f0d112e62f8f1ddda1b6718119fe18eb8a9
2024-05-02 08:30:27 +01:00
Inseob Kim
b7b8457a60 Add logtags support to filesystem module
If build_logtags is set to true, etc/event-log-tags will be built by
collecting all logtags files from all dependencies.

Note that this is different from Makefile's current behavior that
collects all logtags files, including ones from uninstalled modules. But
the behavior is probably unintended, and ideally each partition image
should have its own logtags, rather than putting all tags to /system.

Bug: 336189540
Test: m aosp_cf_system_x86_64
Change-Id: I72b384cbb65e812af909eacd18799bd86f1dab13
2024-05-02 13:52:43 +09:00
Treehugger Robot
c2a1c063b4 Merge "Add a new property trim_extension for gensrcs" into main am: 512b52f759
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3048196

Change-Id: I16072941341f26fcbad1b04df6f0ab34734cece2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 02:16:35 +00:00
Treehugger Robot
512b52f759 Merge "Add a new property trim_extension for gensrcs" into main 2024-05-02 01:43:26 +00:00
Treehugger Robot
218178bcbb Merge "Add support for keyboard prebuilt module type" into main am: 5197e880d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066844

Change-Id: I6ae1583b0e0c2426e490ad0b45eb89e5c7c4cad8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 01:11:43 +00:00
Treehugger Robot
5197e880d9 Merge "Add support for keyboard prebuilt module type" into main 2024-05-02 01:08:04 +00:00
Kiyoung Kim
e8bfe963bd Merge "Move LLNDK related logic to llndk_library" into main am: 3a7caee04b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3064822

Change-Id: I12f1e24249ab0cc5bb743e490433c0d95c435cde
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 01:04:32 +00:00
Cole Faust
30b11224de Add aosp-first preupload hook to soong
To give an earlier warning than the ayeaye warning in gerrit.

Test: Presubmits
Change-Id: Ic1bf8ab34cb76313dc53833600ea9ceaddb045c5
2024-05-01 17:54:59 -07:00
Kiyoung Kim
3a7caee04b Merge "Move LLNDK related logic to llndk_library" into main 2024-05-02 00:46:11 +00:00
Inseob Kim
2e87b97ef3 Merge "Install classpath protobuf files" into main am: 7cadaf6708
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3066843

Change-Id: I5289b04487c8924e15c440819529a22a9dd32603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-02 00:36:32 +00:00
Inseob Kim
7cadaf6708 Merge "Install classpath protobuf files" into main 2024-05-01 23:58:38 +00:00
Priyanka Advani
c4466a6387 Merge "Revert "Make the enabled property configurable"" into aosp-main-future 2024-05-01 23:03:34 +00:00
Colin Cross
55f169abaa Raise test timeout when running soong tests with race detector
The apex tests sometimes hit the default 10 minute timeout when running
with the race detector enabled in the aosp-build-tools builds.

Test: treehugger
Flag: NONE
Change-Id: I6092a0c68c3b79cd24cdd4a6a8614f7eced7dc1a
2024-05-01 15:25:37 -07:00
Cole Faust
72455888ea Merge "Add tests for error when assigning select to nonconfigurable property" into main am: bf18d23827
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3068524

Change-Id: I795efc5976f0dbc490a62fe67dae308712d46a35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-01 21:15:42 +00:00
Cole Faust
bf18d23827 Merge "Add tests for error when assigning select to nonconfigurable property" into main 2024-05-01 20:56:57 +00:00
AdityaK
1938410342 IsEnvTrue and IsEnvFalse should take True and False as valid values respectively.
Change-Id: Ibca5800c0846a45e3811db76fb5ad46b8a7eb1c1
2024-05-01 13:51:25 -07:00
Priyanka Advani
ed5276f082 Revert "Make the enabled property configurable"
Revert submission 27162921-configurable_enabled_property

Reason for revert: Droid-monitor created revert due to Build breakage in b/338253720. Will be verifying through ABTD before submission.

Reverted changes: /q/submissionid:27162921-configurable_enabled_property

Change-Id: I2d144f9d297373a13a1190b173d10c966181ad84
2024-05-01 20:02:41 +00:00
Cole Faust
1256e6f47a Merge "Make the enabled property configurable" into aosp-main-future 2024-05-01 19:33:59 +00:00
LaMont Jones
15902f2f4c Guard with RELEASE_BUILD_FLAGS_IN_PROTOBUF
If false, then we output an empty file, which will cause
release_config.mk to do the old process.

Bug: 328495189
Test: manual
Change-Id: I4aa82301f3bbb29633a275a801431a6667feb48d
2024-05-01 12:14:41 -07:00