StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,118 Commits 1 Branch 0 Tags
ea296c636fa5320e4b60fb3ee87b6b29f47d931b
Commit Graph

85118 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Colin Cross
ea296c636f Merge "Track resources separately in java_import" into main am: 7c2af51a3d am: 11b14d2eda 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3221407

Change-Id: I2c416d3e36eadd5d6701632f61d20f27c73d12d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:47:25 +00:00
Treehugger Robot
61e7802b97 Merge "Clean up: remove com.android.gki.*" into main am: 75b14ee1a6 am: 48f28c9232 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3223004

Change-Id: I8073c82e183c1519885c9c9f64892426c9f3443b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:47:04 +00:00
Colin Cross
08936fa062 Merge "Convert more stored WritablePaths to Paths" into main am: 6ca3f758d0 am: 5e989b554c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3221406

Change-Id: I3a3571c655179e359a73e400260e9d06f06989c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:46:46 +00:00
Treehugger Robot
3e54d6eeb6 Merge "Run "ravenizer" on ravenwood jars" into main am: 08e76d9591 am: 099f466484 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3225782

Change-Id: I86a2ae6db5c7a1bb5300a8a057dac5f29d072158
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:45:59 +00:00
Yu Liu
9d953a2c98 Merge "Remove more internal fields from ModuleBase." into main am: fb995a1e3c am: a5c0d1f355 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3221927

Change-Id: I50d4ae30cb6c638c2ddf443e16cde7e8fc76d781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:45:30 +00:00
Colin Cross
11b14d2eda Merge "Track resources separately in java_import" into main am: 7c2af51a3d 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3221407

Change-Id: Ib4bd8f81be30ef3c82244f24bf267bdbb7363c60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:31:35 +00:00
Treehugger Robot
48f28c9232 Merge "Clean up: remove com.android.gki.*" into main am: 75b14ee1a6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3223004

Change-Id: Ia630547bc9458b60ec31c7cc50a3cba762f11334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:31:19 +00:00
Colin Cross
5e989b554c Merge "Convert more stored WritablePaths to Paths" into main am: 6ca3f758d0 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3221406

Change-Id: I162b94190cb28fa7f74901557d9b45c313b1b66a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:30:59 +00:00
Colin Cross
7c2af51a3d Merge "Track resources separately in java_import" into main 2024-08-16 22:30:33 +00:00
Treehugger Robot
099f466484 Merge "Run "ravenizer" on ravenwood jars" into main am: 08e76d9591 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3225782

Change-Id: I1c9c6faadae080fd32d769b1acafc090ed1d85e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 22:30:08 +00:00
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
Treehugger Robot
75b14ee1a6 Merge "Clean up: remove com.android.gki.*" into main 2024-08-16 22:22:19 +00:00
Colin Cross
6ca3f758d0 Merge "Convert more stored WritablePaths to Paths" into main 2024-08-16 22:16:56 +00:00
Treehugger Robot
08e76d9591 Merge "Run "ravenizer" on ravenwood jars" into main 2024-08-16 22:16:41 +00:00
Yu Liu
fb995a1e3c Merge "Remove more internal fields from ModuleBase." into main 2024-08-16 22:14:01 +00:00
Colin Cross
fb84d87cf8 Merge "Move kotlin stdlib to normal dependency tag" into main am: f0df94a76d am: 45e2c9ba92 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216738

Change-Id: Ia2b7bf321f0765363d47b5c893584d95ec0b3afb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 21:41:43 +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
f211913482 Merge "Use rsp files to pass turbine inputs to RBE" into main am: f330b3dc77 am: 53c33178d1 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3214560

Change-Id: If29b1f14e717c727b567e903ade6f7d4d53194eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 21:00:41 +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
Makoto Onuki
7ded3827a4 Run "ravenizer" on ravenwood jars 
Ravenizer is a new tool to preprocess ravenwood tests.

It can optionally be applied to other java targets (for analyzing them,
etc).

The actual tool is being implemented internally, so in AOSP, we just
use a script that copies the jar file as a replacement.

Test: manual -- run `m RavenwoodBivalentTest` and make sure the ravenizer
    log message shows up.
Flag: EXEMPT host test change only
Bug: 360390999
Change-Id: I6d1f81e7c425397b16c37e7c30267957097387fd
 2024-08-16 12:08:35 -07:00
Colin Cross
53529a9061 Track resources separately in java_import 
java_import currently collects the "implementation and resource jar"
from each of its dependencies.  This results in different resource
conflict resolution than other java modules, which collect
implementation jars and resource jars separately.  Modify java_import
to match the other module types.

Flag: EXEMPT refactor
Test: all soong tests pass
Change-Id: I06134e2621582799b3a525d2c12b900b8d86d171
 2024-08-16 11:56:19 -07:00
Jooyung Han
40b7917fd0 Clean up: remove com.android.gki.* 
It's abandoned.

Bug: n/a
Test: m nothing --no-skip-soong-tests
Change-Id: I220bea87329ee532d494cc4eaa4c6a8c1b0bff07
 2024-08-16 16:02:42 +09:00
Colin Cross
77965d9bd4 Convert more stored WritablePaths to Paths 
Similar to I40f28075ce151e4be80d6cfc7ec173dfa46f9bbf, convert
more long-lived WritablePaths to Paths.

Test: all soong tests pass
Flag: EXEMPT refactor
Change-Id: I9be448f811694fe0524fbbd7c5d4553cf69d533a
 2024-08-15 20:43:39 -07:00
Kiyoung Kim
e43049d38a Merge "Introduce vintf_fragment module type" into main am: dd00f2de3c am: a1d5004a0f 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3213372

Change-Id: I9cd4a450e7e56268bee2177f687f79271ccdcd14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-16 00:59:21 +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
f1387a54a1 Merge "Improve docs for Deapexer modules" into main am: 334efc0fb1 am: 27811bb576 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3217132

Change-Id: I2d1973ca44f54b0cdd40f2f575e797f95c2187ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-15 22:55:15 +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
84647537ab Merge "Fix build_prop module to use partition() instead of PartitionTag()" into main am: d0ea3f6a84 am: 9fd0ad4ca9 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216965

Change-Id: Ib3d133c9f7b4c7941e6a5653b53cf979420b5de3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-15 21:44:18 +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
132c472d6c Merge "Check that the DeapexerInfo was actually set" into main am: 47a91c9f4f am: cf2d680a05 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216739

Change-Id: Ie39724cdfb87beab7d5563b0de5ea9496b1d8a91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-15 18:33:13 +00:00
Yu Liu
6afd52a68d Merge "Remove installFiles from ModuleBase." into main am: e89b6dd497 am: df8125ba55 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3214788

Change-Id: Idcd4533e223a3bafbe8cc273c2eef0d7787f81d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-15 18:32:58 +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
3dd87f7a81 Merge "Support configurable prebuilt apex sources" into main am: 3306d84c07 am: ce1a11c339 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3219956

Change-Id: I0c98f74fac97834f64dcce782186ebf0650494bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-15 16:21:01 +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
2a109e873f Merge "Support BUILD_FRAMEWORK_COMPATIBILITY_MATRIX for soong" into main am: 4483c0e7c0 am: 135b15001c 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3195824

Change-Id: Ie7104387edfe0718f38d849f9fb7b3922e106180
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-15 09:55:31 +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