Commit Graph

8274 Commits

Author SHA1 Message Date
Treehugger Robot
ca4f13e33c Merge "Convert some properties to Configurable properties" into main am: c6b5fdbc5c am: 655c526ec2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3095915

Change-Id: Ia0c137117516024f6ebe462532373323d5adc56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 21:52:33 +00:00
Spandan Das
e0063f7f10 Merge "Override modules should always override source modules" into main am: 2f9af23734
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3106441

Change-Id: Ib33a4421e62c94bb426d1ef46c2e5f9312b78a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 16:45:57 +00:00
Spandan Das
2f9af23734 Merge "Override modules should always override source modules" into main 2024-05-29 16:25:45 +00:00
Jiyong Park
1d6f33918d Merge "Required deps don't track native bridge architectures" into main am: a03e16f1b9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3105117

Change-Id: I72e6bb88e1a66b604a9ccc59d84a664bcbce0fea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-29 04:20:24 +00:00
Jiyong Park
a03e16f1b9 Merge "Required deps don't track native bridge architectures" into main 2024-05-29 03:59:58 +00:00
Spandan Das
0b28fa0b84 Override modules should always override source modules
Since overrides are implemented as variants of the source module, the
override module should not be replaced with prebuilts of the source
module even when the prebuilt is preferred.

Test: go test ./apex
Change-Id: I26e97f700276e7beaf6d1bd61b164f11d57a5e09
2024-05-29 00:06:32 +00:00
Jiyong Park
8db4415616 Required deps don't track native bridge architectures
Bug: 342945184
Test: build aosp_cf_x86_64_only_phone and check if
out/target/product/vsoc_x86_64_only/system/lib64/arm64 directory doesn't
exist.

Change-Id: I1638610ac686b369b23390768af1564b3cf38d9b
2024-05-28 14:29:22 +09:00
yangbill
65966d29a4 Allow required property be conditional for release_aidl_use_unfrozen am: 585564cab2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3099338

Change-Id: I7206f89198f4e9f1194f164992fee5d4776adf1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-27 04:09:34 +00:00
yangbill
585564cab2 Allow required property be conditional for release_aidl_use_unfrozen
Bug: 342336921
Test: cd build/soong/android ; go test -run TestProductVariables
Test: add product_variables.release_aidl_use_unfrozen.required to the
phony module.

Change-Id: I9b934a8fb6245b9b6fd0f2db1e67d5e2876490b2
2024-05-27 02:35:49 +00:00
Kiyoung Kim
f204f58469 Merge "Remove VndkUseCoreVariant related code from build" into main am: 60cec95e01
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3102677

Change-Id: Ib6025711605712bd8fb84d92f756119fba77e54d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-27 01:11:55 +00:00
Kiyoung Kim
60cec95e01 Merge "Remove VndkUseCoreVariant related code from build" into main 2024-05-27 00:59:37 +00:00
Treehugger Robot
655c526ec2 Merge "Convert some properties to Configurable properties" into main am: c6b5fdbc5c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3095915

Change-Id: I9d13a27541e62e82b0e23708740473d40cb15c30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 21:26:59 +00:00
Treehugger Robot
c6b5fdbc5c Merge "Convert some properties to Configurable properties" into main 2024-05-24 20:52:27 +00:00
Xin Li
8a31520ef8 Merge Android 24Q2 Release (ab/11526283) to aosp-main-future
Bug: 337098550
Merged-In: I4a6dd1c5e48db7085ea41035def31f0844948a46
Change-Id: If8ad1d0d87495bbd685f5f9f03f5eb7ea78bf192
2024-05-24 08:25:18 -07:00
Devin Moore
570d72b1cf Let Release_aidl_use_unfrozen add vintf_fragments
The product_config variable can be used to add different
vintf_fragments.

Ignore-AOSP-First: this is required for vFRC finalization and needs to be submitted ASAP. This can be cherry-picked to aosp after finalization.

Test: launch_cvd && atest hal_implementation_test
Test: lunch `next` && atest vts_treble_vintf_framework_test
Bug: 279809333
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:b93c1a74cf89caef950c63d64b93f2ccfefcbce8)
Merged-In: Ied17ad4c4564a5d97f93001734fba7cc6648bbc2
Change-Id: Ied17ad4c4564a5d97f93001734fba7cc6648bbc2
2024-05-24 10:12:52 +00:00
Kiyoung Kim
22152f6cda Remove VndkUseCoreVariant related code from build
VndkUseCoreVariant feature is deprecated along with VNDK. This change
removes related code from Soong.

Bug: 330100430
Test: AOSP CF build succeeded
Change-Id: Ie182c9e4dc9cf0a4fe9d5fddf5b36754ddb53d18
2024-05-24 10:45:28 +09:00
Jihoon Kang
959fd4c642 Merge "Propagate DirectlyInAnyApex to transitive dependencies" into main am: d02bd377da am: d6638ef5e9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3098497

Change-Id: I2fa7154d8e24ce8db740b83dbd35fa73d02e70a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-24 01:17:03 +00:00
Jihoon Kang
d02bd377da Merge "Propagate DirectlyInAnyApex to transitive dependencies" into main 2024-05-24 00:58:05 +00:00
Jihoon Kang
46d66de1c1 Propagate DirectlyInAnyApex to transitive dependencies
`UpdateDirectlyInAnyApex` is used to propagate the ApexProperties
`DirectlyInAnyApex` and `InAnyApex` to the direct dependencies of the
direct dependencies of an apex bundle. In other words, this will be
propagated only to two-levels max dependency from the apex bundle.

However, the implementation library of the sdk library can have longer
dependency chain from the apex bundle than two levels:
e.g. apex -> bcpf -> sdk_lib -> sdk_lib impl lib

Therefore, even if the implementation library of the sdk library is
registered as a dependency using the "CopyDirectlyInAnyApexTag"
dependency tag, the ApexProperties would not be propagated to the
implementation library. In order to resolve this issue and recognize
the implementation library to be directly in apex and allow
instrumentation for the implementation library, this change proposes
propagating `DirectlyInAnyApex` and `InAnyApex` to transitive
dependencies on top of direct dependencies.

Test: DIST_DIR=dist_dir TARGET_BUILD_VARIANT=userdebug PRODUCT=mainline_modules_x86_64 COVERAGE_MODULES="uwb" ./vendor/google/build/build_unbundled_coverage_mainline_module.sh && \
unzip -l out/target/product/module_x86_64/jacoco-report-classes-all.jar and ensure that framework-uwb is included
Bug: 341170242

Change-Id: I27d7a74f6e5bc3e0a044d13c619f4897b6b2eb57
2024-05-23 22:40:35 +00:00
Treehugger Robot
efc286d3c3 Merge "Add test for parse error" into main am: 788100e2a8 am: 309652433c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3097978

Change-Id: Id85b19db79626a6511311b79b0bdab53bebc4c15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 20:21:24 +00:00
Treehugger Robot
788100e2a8 Merge "Add test for parse error" into main 2024-05-23 19:50:12 +00:00
Treehugger Robot
cc2b4f482e Merge "Allow experimental Java target 21 by default" into main am: bc44eb03db am: 1e6f57b6dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3099283

Change-Id: Icbd72acac5b729b16b71c3fac4d55ca29232163a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 17:51:23 +00:00
Treehugger Robot
bc44eb03db Merge "Allow experimental Java target 21 by default" into main 2024-05-23 16:37:21 +00:00
Sorin Basca
253f8c045a Allow experimental Java target 21 by default
Bug: 342332820
Test: EXPERIMENTAL_TARGET_JAVA_VERSION_21=true m
Change-Id: I6cc21bf191385df91c2446b7cd6291a0e3532bea
2024-05-23 10:28:24 +01:00
Cole Faust
82bdeba837 Merge "Support soong config value variables on Configurable properties" into main am: c15b0234e9 am: 341d2f51ba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3097980

Change-Id: Ibdf179121877bafd0862194d5d66e55fb2977c43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-23 00:36:38 +00:00
Cole Faust
aeecb75be2 Add test for parse error
This used to error out prior to the other cl in this topic.

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I6d95eb00c75836a5a0c60e07bfd4b306388591ed
2024-05-22 17:01:59 -07:00
Cole Faust
c15b0234e9 Merge "Support soong config value variables on Configurable properties" into main 2024-05-22 23:58:50 +00:00
Cole Faust
5f29706843 Support soong config value variables on Configurable properties
Configurable properties were previously not having their %s's
substituted with the actual value.

Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: Id317e58a1fd878db5452d5d0a5df588021bcdcdb
2024-05-22 14:34:47 -07:00
Cole Faust
fdec8723d5 Convert some properties to Configurable properties
Focusing on the properties needed to remove soong config modules from
packages/modules/Virtualization.

- prebuilt_etc's src and srcs
- filegroup's srcs and exclude_srcs
- rust's cfgs

Bug: 342006386
Test: m nothing --no-skip-soong-tests
Change-Id: I6971da744a17955f98104948e6f9614776955782
2024-05-22 13:33:42 -07:00
Cole Faust
565f1bd1b9 Merge "Add tests for unhandled select condition errors" into main am: 5e79b167b8 am: fbef4fc8f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3081963

Change-Id: I8d1e3f451a34f95c66b72f427dcef4b52596189f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 19:26:02 +00:00
Spandan Das
aa9369b71d Drop IncludeTags
This was previously used in conjunction with blueprint_package_includes
to prune Android.bp files from soong analysis.

Test: m nothing
Bug: 308188212
Change-Id: Ie82e20eec63bd0be70e1cf0290c70f62d5621c76
2024-05-22 19:23:47 +00:00
Cole Faust
5e79b167b8 Merge "Add tests for unhandled select condition errors" into main 2024-05-22 18:51:10 +00:00
Treehugger Robot
bbae8cd08f Merge "Export release flag types to make/soong" into main am: d7b71490ae am: 1835d95d99
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3094709

Change-Id: I21663e369aa758dd3eb03cf5d1a53a3b15347127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 02:58:10 +00:00
Cole Faust
751a4a5fa2 Export release flag types to make/soong
And use the types to appropriately type selects on the release
variables.

Bug: 323382414
Test: Presubmits
Change-Id: Ide7eca95662caaa7b4be42e20399d9fcd7fed35f
2024-05-21 18:09:05 -07:00
Cole Faust
b2ed4b3793 Merge "Update select tests for optionals" into main am: 4ab1563fe5 am: fd4249510d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3094707

Change-Id: Ie3fe41647e20b5b14b439e28eee84390b0660ca2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-22 00:37:24 +00:00
Cole Faust
4ab1563fe5 Merge "Update select tests for optionals" into main 2024-05-22 00:02:41 +00:00
Treehugger Robot
5ea7ecb836 Merge "Remove printf in tests" into main am: c7360364fc am: 382afbaf9b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3096237

Change-Id: Ic42d4c86886f5d27158c3e5fa9f5a767028b162d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 23:34:48 +00:00
Treehugger Robot
c7360364fc Merge "Remove printf in tests" into main 2024-05-21 22:50:22 +00:00
Cole Faust
749eeaa94c Update select tests for optionals
Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I314719c9e287638acbc1ef82651d14fee6e1a55a
2024-05-21 14:19:05 -07:00
Cole Faust
2084345022 Add test for selects with variables am: b9519094d9 am: 167c9be663
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3096217

Change-Id: I4001708a538edf54240bbdffaec8e0c64298706c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 19:29:54 +00:00
Cole Faust
bc82eaf0f6 Remove printf in tests
This causes unnecessary spam when running
m nothing --no-skip-soong-tests.

Test: m nothing --no-skip-soong-tests
Change-Id: I4d893b3da47a9f79774c67274a84ff77be9c4811
2024-05-21 11:22:29 -07:00
Cole Faust
b9519094d9 Add test for selects with variables
I thought this might need extra parsing code to handle, but it appears
to work fine.

Bug: 323382414
Test: Presubmits
Change-Id: I4e8bf44a222427c34b2709a41aa5497984154d9d
2024-05-21 11:20:15 -07:00
Yu Liu
638c28a1a9 Merge "Write ninja file in parallel." into main am: 928cb6d557 am: 2ac88c1e43
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3089625

Change-Id: I0cb321c670c445a87f3cfe868cff3a6ad6f1fa07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 17:53:04 +00:00
Yu Liu
928cb6d557 Merge "Write ninja file in parallel." into main 2024-05-21 17:22:01 +00:00
Jiyong Park
48f2f580ed Merge "Add multilib.prefer32.deps to packaging base" into main am: 46469d6a03 am: 7bf969053d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3093784

Change-Id: Ie041657ae6a35f15ff07e02def31d2cb3b001b5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-21 01:55:03 +00:00
Jiyong Park
46469d6a03 Merge "Add multilib.prefer32.deps to packaging base" into main 2024-05-21 01:00:58 +00:00
Yu Liu
1b2ddc8093 Write ninja file in parallel.
Bug: 335718784
Test: CI
Change-Id: Ie36d78478a60359b704767689846e76b1c2ba76d
2024-05-20 20:28:44 +00:00
Treehugger Robot
75ba7e9d2e Merge "Dump the required modules into module-info.json" into main am: a6ecdd39c8 am: 7bef057a69
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3094443

Change-Id: I7b006fbedb2ffeade29213e9a6e780b0fbb8bf71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-20 18:17:51 +00:00
Treehugger Robot
f325babc6d Merge changes Ifbe123d1,Ie2e738a6 into main am: 8298134503 am: 665ece7963
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3083813

Change-Id: I849464d86f7b07e661bc4106e3dc2e77eebdeddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-05-20 18:17:39 +00:00
Treehugger Robot
a6ecdd39c8 Merge "Dump the required modules into module-info.json" into main 2024-05-20 17:55:15 +00:00