Commit Graph

81998 Commits

Author SHA1 Message Date
Jiyong Park
321db03358 Merge changes from topic "revert-3069323-revert-3066748-duplicate_entry_fs-CIBDJQYRHU-FVLDIVWUZV" into main am: 7c9ab4f5b1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3069326

Change-Id: I0b816b90f97b7a1ae1cb10afa3dc0115b25a83ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-04 04:09:02 +00:00
Jiyong Park
7c9ab4f5b1 Merge changes from topic "revert-3069323-revert-3066748-duplicate_entry_fs-CIBDJQYRHU-FVLDIVWUZV" into main
* changes:
  Revert^2 "Filesystem modules follow the installation semantic"
  Revert "Revert "Prevent multiple PackagingSpecs having same inst..."
2024-05-04 03:56:55 +00:00
Treehugger Robot
c6d2c47381 Merge "Correct the order of the SdkKinds" into main am: b92fc67f50
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3074864

Change-Id: I28c96738139b0da7cb598ed14b9f5370e97ad150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-04 01:46:48 +00:00
Treehugger Robot
b92fc67f50 Merge "Correct the order of the SdkKinds" into main 2024-05-04 01:17:19 +00:00
Jihoon Kang
248cc0072c Correct the order of the SdkKinds
Currently, all sdkKind enums are ordered from the narrower api surface to
the wider api surface, with the exception of the toolchain api surface.
This change corrects the order of the toolchain api surface so that the
enum entries are sorted in the correct order.

Test: m nothing --no-skip-soong-tests
Bug: 338660802
Change-Id: Iad4205c9ce1a83be2f7d80647366fba78e9805ca
2024-05-04 00:06:59 +00:00
Colin Cross
1c15c15d96 Merge "Convert overrides to a TransitionMutator" into main am: 5694d3f290
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3070707

Change-Id: If6a4185805383ea12e8b217fd37c698cbe519a33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 17:59:02 +00:00
Treehugger Robot
39435fdcd7 Merge "Pass module-lib and system-server extension jars for system-server" into main am: 7a4d748669
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3072144

Change-Id: I596139c5cdd1e118dc99c4bfc9b40ca0feb97a0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 17:58:30 +00:00
Treehugger Robot
ff74a33524 Merge "Remove warning about LOAS not enabled" into main am: c9cc298bc6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3073552

Change-Id: Ib2d0defe1c1abe4176f2153adaed713095687ecb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 17:57:10 +00:00
Colin Cross
5694d3f290 Merge "Convert overrides to a TransitionMutator" into main 2024-05-03 17:54:51 +00:00
Treehugger Robot
7a4d748669 Merge "Pass module-lib and system-server extension jars for system-server" into main 2024-05-03 17:54:07 +00:00
Treehugger Robot
c9cc298bc6 Merge "Remove warning about LOAS not enabled" into main 2024-05-03 17:38:44 +00:00
Treehugger Robot
5e9bb5ac70 Merge "Use no_full_install: true instead of installable: false" into main am: baaa1b1eeb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3069502

Change-Id: I4ae32cc61dabd1359d493f52d3200f4f07ce917b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 15:32:34 +00:00
Treehugger Robot
baaa1b1eeb Merge "Use no_full_install: true instead of installable: false" into main 2024-05-03 15:15:23 +00:00
Oriol Prieto Gascó
ff7d15ed9e Merge "Make container mandatory in aconfig_declarations." into main am: a874e94bab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3058702

Change-Id: I6e9e2d8eb1f816a96e456d4d287b8821a2a606c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-03 14:25:58 +00:00
Oriol Prieto Gascó
a874e94bab Merge "Make container mandatory in aconfig_declarations." into main 2024-05-03 14:09:48 +00:00
Kousik Kumar
074e4cc9ad Remove warning about LOAS not enabled
RBE is now the default for all Google internal builds, so this warning
is no longer necessary.

Bug: n/a
Change-Id: I2da3e9b84c20f32b3e3f90f49a974512248db2ec
2024-05-03 13:50:10 +00:00
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
Paul Duffin
92efc6107f Pass module-lib and system-server extension jars for system-server
While the `system-server` API surface extends the `module-lib` API
surface a library can only provide one or the other as they appear
in bootclasspath and systemserverclasspath respectively. A library
that is on the bootclasspath cannot provide a `system-server` API
as it would be usable by non-system server code. A library that is
on the systemserverclasspath could provide a `module-lib` API but
there is no point as it would only be usable by the system server
making it effectively a `system-server` API anyway.

As a result the `system-server` extension directories only contain
`service-*` jars for libraries that provide system server APIs.

e.g.
```
$ ls prebuilts/sdk/extensions/11/system-server | cat
api
service-adservices.jar
service-sdksandbox.jar
$ ls prebuilts/sdk/extensions/11/module-lib/ | cat
api
framework-adservices.jar
framework-connectivity.jar
framework-connectivity-t.jar
framework-sdksandbox.jar
framework-tethering.jar
```

So, in order to construct the whole `system-server` API, i.e. the API
visible to the system server, it is necessary to add in the
`module-lib` extension jars too which this change does.

This is necessary to construct an `api-versions.xml` file for the
complete `system-server` API.

Bug: 336993217
Test: TARGETS=$(for i in public system module-lib module-lib-complete system-server-complete; do U=$(echo $i | sed "s|-|_|g"); echo "out/target/common/obj/PACKAGING/api_versions_${U}_generated-api-versions.xml"; done)
      m $TARGETS; mkdir -p before; cp $TARGETS before
      m $TARGETS; mkdir -p after; cp $TARGETS after
      meld before after
      # Review differences.
Change-Id: Ic9652dd28f05e5f569a7a30a84b87f227314d119
2024-05-03 12:21:56 +01: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
Colin Cross
49be24b833 Convert overrides to a TransitionMutator
Replace the performOverrideMutator with a TransitionMutator.

Bug: 319288033
Flag: NONE
Test: all soong tests pass
Test: no change to build.ninja
Change-Id: I358f260f1bcd894d7803036ce77ba666c0429355
2024-05-02 15:31:58 -07: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