Commit Graph

84778 Commits

Author SHA1 Message Date
Yu Liu
a5c0d1f355 Merge "Remove more internal fields from ModuleBase." into main am: fb995a1e3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3221927

Change-Id: Icafa7150b5320cbff6dffaef15453a078f39c9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-16 22:27:52 +00:00
Yu Liu
fb995a1e3c Merge "Remove more internal fields from ModuleBase." into main 2024-08-16 22:14:01 +00:00
Colin Cross
45e2c9ba92 Merge "Move kotlin stdlib to normal dependency tag" into main am: f0df94a76d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216738

Change-Id: Ib86bb51550db89f2e926229610b969fa98e2a79a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-16 21:19:48 +00:00
Colin Cross
f0df94a76d Merge "Move kotlin stdlib to normal dependency tag" into main 2024-08-16 21:01:23 +00:00
Colin Cross
53c33178d1 Merge "Use rsp files to pass turbine inputs to RBE" into main am: f330b3dc77
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3214560

Change-Id: Ib5d6c8c78d29a68414f2c5161a78047e37cc5d43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-16 20:40:52 +00:00
Colin Cross
f330b3dc77 Merge "Use rsp files to pass turbine inputs to RBE" into main 2024-08-16 20:18:09 +00:00
Kiyoung Kim
a1d5004a0f Merge "Introduce vintf_fragment module type" into main am: dd00f2de3c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3213372

Change-Id: Ib6315fa25700f5424791813317b640406ce96b6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-16 00:39:54 +00:00
Kiyoung Kim
dd00f2de3c Merge "Introduce vintf_fragment module type" into main 2024-08-16 00:26:16 +00:00
Yu Liu
d46e5ae670 Remove more internal fields from ModuleBase.
Bug: 358425833
Test: Manual compare the generated ninja and mk files and CI.
Change-Id: I4edd0dc646ac035594f47cd9044cc4eb5f710e64
2024-08-16 00:20:27 +00:00
Treehugger Robot
27811bb576 Merge "Improve docs for Deapexer modules" into main am: 334efc0fb1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3217132

Change-Id: I6e694c4e0e67af73669b1c447889ce8aa42c9cf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 22:30:15 +00:00
Treehugger Robot
334efc0fb1 Merge "Improve docs for Deapexer modules" into main 2024-08-15 22:13:04 +00:00
William McVicker
9fd0ad4ca9 Merge "Fix build_prop module to use partition() instead of PartitionTag()" into main am: d0ea3f6a84
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216965

Change-Id: I88f558e782dc02a58b32ce6ac42c7e300a601010
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 21:15:19 +00:00
William McVicker
d0ea3f6a84 Merge "Fix build_prop module to use partition() instead of PartitionTag()" into main 2024-08-15 20:58:46 +00:00
Cole Faust
cf2d680a05 Merge "Check that the DeapexerInfo was actually set" into main am: 47a91c9f4f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216739

Change-Id: I9d23271205f555da55c0f4a2022927f6eaf88fbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 18:18:36 +00:00
Cole Faust
47a91c9f4f Merge "Check that the DeapexerInfo was actually set" into main 2024-08-15 18:00:22 +00:00
Yu Liu
df8125ba55 Merge "Remove installFiles from ModuleBase." into main am: e89b6dd497
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3214788

Change-Id: I194534a60f18f2a2c0d8f2eac65cc400e50d927a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 17:45:56 +00:00
Yu Liu
e89b6dd497 Merge "Remove installFiles from ModuleBase." into main 2024-08-15 17:23:59 +00:00
Treehugger Robot
ce1a11c339 Merge "Support configurable prebuilt apex sources" into main am: 3306d84c07
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3219956

Change-Id: I09da0c48169e776f87ef8d0dd0f292931ae113cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 16:02:39 +00:00
Treehugger Robot
3306d84c07 Merge "Support configurable prebuilt apex sources" into main 2024-08-15 15:43:52 +00:00
Treehugger Robot
135b15001c Merge "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong" into main am: 4483c0e7c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195824

Change-Id: I64fe62dab270f41bd24f38dd36460b9b381e9448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 09:35:44 +00:00
Treehugger Robot
4483c0e7c0 Merge "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong" into main 2024-08-15 09:07:38 +00:00
Yi-Yo Chiang
3ffc37ce20 Fix build_prop module to use partition() instead of PartitionTag()
PartitionTag() returns the partition the module is installed in.
We don't want this because a system_ext_specific module could be
installed in the system partition if system_ext partition doesn't
exist.
Instead we want system_ext specific modules to always refer to
SystemExtPropFiles().

Bug: 359624775
Bug: 322090587
Test: build aosp_arm64 and verify system/system_ext/etc/build.prop
Change-Id: Ie67ec9c5e5a07e781515e0aafb42122f72447cf3
2024-08-15 07:52:02 +00:00
Cole Faust
c0ca5056ab Check that the DeapexerInfo was actually set
Otherwise we could return empty DeapexerInfos. We're not running into
any problems due to this at the moment, it's just something I noticed.

Bug: None
Test: m nothing --no-skip-soong-tests
Change-Id: I903d86740a9f22574a5f6bf2effa912bd8237ab6
2024-08-14 17:51:03 -07:00
Cole Faust
642e720b5b Support configurable prebuilt apex sources
Bug: 342006386
Fixes: 359690321
Test: m nothing
Change-Id: I2e503932c7fdb3eea9cd2dfedd86029ff52cfbe1
2024-08-14 17:46:12 -07:00
Yu Liu
ddc2833b7f Remove installFiles from ModuleBase.
This is to limit the direct accesses to the internal fields of a
module in order to better support incremental caching. To access
the install files data from singleton context or other modules'
context use providers thru the provided wrapper; to access it
from the same module inside GenerateBuildActions use ctx which is
short-lived only inside this method.

Bug: 358425833
Test: CI
Change-Id: I337b07a2ef95fb2a898ac2f9277160a3f76a603c
2024-08-14 22:56:30 +00:00
Dan Albert
8fbaff4a3d Merge "Revert^2 "Verify that ndk_headers headers are valid C."" into main am: 61bd3d11e9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3218116

Change-Id: I6d7fc9f06398c64ce3c1b735925833c68028388a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-14 22:40:51 +00:00
Colin Cross
882d600d79 Move kotlin stdlib to normal dependency tag
The kotlin standard library was added with a custom dependency tag,
which then required special handling later.  We know up front whether
it will be treated the same as a static_libs or libs dependency, so
just reuse staticLibTag or libTag, and remove all the special handling.

Bug: 308016794
Test: TestKotlin
Flag: exempt REFACTOR
Change-Id: I2c5601faec284d88f28e13378d9cbffc24560efa
2024-08-14 15:28:34 -07:00
Dan Albert
61bd3d11e9 Merge "Revert^2 "Verify that ndk_headers headers are valid C."" into main 2024-08-14 22:25:10 +00:00
Treehugger Robot
bce9087a8e Merge "Always generate PDB for Windows executable" into main am: 67e25d144a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3214561

Change-Id: I407b8117de2a35117d99f2c19045fa2f7da8e481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-14 21:45:50 +00:00
Treehugger Robot
67e25d144a Merge "Always generate PDB for Windows executable" into main 2024-08-14 21:26:48 +00:00
Fabien Sanglard
aa8020ac13 Always generate PDB for Windows executable
Test: NA
Bug: 350154912
Change-Id: I0a4ebfb62643eb2c8d2b20992e728bcb8b5219a9
2024-08-14 13:31:55 -07:00
Treehugger Robot
3183635a66 Merge "Pass through RUST_LOG" into main am: 97da65f8ad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3218721

Change-Id: Iae399b9f262651aebafa9286c26f549ad4214776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-14 19:42:29 +00:00
Treehugger Robot
97da65f8ad Merge "Pass through RUST_LOG" into main 2024-08-14 19:27:31 +00:00
Spandan Das
bcc2ef06e7 Improve docs for Deapexer modules
The provider does not get bubbled up, so remove this misleading comment.

Test: doc change
Change-Id: Ife110aa75c8910042cf9c6e358a44d1a5cf4f5c3
2024-08-14 18:55:59 +00:00
Jihoon Kang
ca43c1fe44 Correct the name of the android.car.builtin module that is instrumented am: 6de6d7267f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3219097

Change-Id: I5b6630e12c928dcd6134ddb12c4c51fcda93e940
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-14 18:51:53 +00:00
LaMont Jones
b2ab527798 Pass through RUST_LOG
If the user has RUST_LOG set in the environment, pass that through.

Bug: 352600283
Test: manual
Change-Id: Ia6bfa4be791a8e72591fc729de4e4270df150a1c
2024-08-14 10:08:50 -07:00
Jihoon Kang
6de6d7267f Correct the name of the android.car.builtin module that is instrumented
java_sdk_library is not instrumented as it does not perform any
compilation actions. Instead, its submodule impl lib (with .impl suffix)
is instrumented.

Test: CI
Bug: 355514682
Bug: 339901608
Change-Id: I2f7b4a8cf14a592d268b6f5d44f72e43700b4907
2024-08-14 16:39:57 +00:00
Kiyoung Kim
faf6af31cd Introduce vintf_fragment module type
Introduce a new vintf_fragment module type which handles vintf_fragment
files within Soong. This will help process to move vintf_fragment
handling logic from KATI to Soong. This change also introduces
vintf_fragment_modules property to mark dependency with vintf_fragment
modules.

Bug: 322089980
Test: m nothing --no-skip-soong-tests passed
Change-Id: I49607f42aeee3ded0ba7b078b903dc35f5d61637
2024-08-14 10:34:41 +09:00
Xin Li
7a1fb9d52f Mark 24Q3 (ab/AP3A.240905.015) as merged
Bug: 347831320
Merged-In: Idacb65313553bdea5c0593976694de478034229e
Change-Id: I60149478638c0bd8b65629e9965401696ec88ecf
2024-08-13 15:41:59 -07:00
Dan Albert
266f991cc5 Revert^2 "Verify that ndk_headers headers are valid C."
181934cc26

Change-Id: I7720331ee8132ead8d0b5624a0b99841884300d3
2024-08-13 22:01:23 +00:00
Colin Cross
2fcc48e4a3 Use rsp files to pass turbine inputs to RBE
Turbine rules that run in RBE fail when they have long lists of
flags.  They work locally because the list of flags is placed in
an RSP file, but the list of inputs still appears on the command
line when RBE is enabled to pass them to rewrapper.

When the list of srcjars or classpath arguments are too long,
move the list of files into an rsp file, and pass the rsp file to
RBE instead of the list of files.

Bug; 308016794
Test: builds
Flag: EXEMPT refactor

Change-Id: I5ee610a91302ce94ec77b6f13b28a29bc63fd962
2024-08-13 14:07:47 -07:00
Yu Liu
2db4f06825 Merge "Skip writing ninja file for module with a cache hit during incremental build." into main am: 8bf4079e5f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3199910

Change-Id: I9499830d7a05690bcb4f3be40cf5261bca1541a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-13 17:34:46 +00:00
Yu Liu
8bf4079e5f Merge "Skip writing ninja file for module with a cache hit during incremental build." into main 2024-08-13 17:00:55 +00:00
Yu Liu
73282e8129 Merge "Merge SingletonProviderContext with OtherModuleProviderContext" into main am: 246b43049c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216676

Change-Id: Ib0d8eb66616fa4775e3827b4956ad19034bf1cc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-13 16:15:51 +00:00
Yu Liu
246b43049c Merge "Merge SingletonProviderContext with OtherModuleProviderContext" into main 2024-08-13 15:56:16 +00:00
Treehugger Robot
4081f58abb Merge "Refactor containers" into main am: f20696e112
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216637

Change-Id: I87fbd3fe98e84488350fd70f9c7d3f322358dcfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-13 05:15:46 +00:00
Treehugger Robot
f20696e112 Merge "Refactor containers" into main 2024-08-13 04:47:43 +00:00
Yi Kong
233b2657fe Merge "Remove workaround for old libc++" into main am: c128a6808e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216575

Change-Id: I8f10fe7c7a9d42b9daeb7f74127d04a6825375bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-13 02:30:34 +00:00
Yi Kong
c128a6808e Merge "Remove workaround for old libc++" into main 2024-08-13 02:07:31 +00:00
Treehugger Robot
9d699ca096 Merge "Make the srcs and exclude_srcs properties configurable" into main am: aa65374cc1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3217278

Change-Id: Idb36b4a5436e7c40edb51cf311d070f3ef3872d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-13 01:44:05 +00:00