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

8682 Commits

Author SHA1 Message Date
Yu Liu
1ecec6f398 Merge "Access output files thru providers in Soong tests." into main am: fed2be9f98 am: de9f7f2f00 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233572

Change-Id: I5a9f76b9186308fdae9ce59e6ad0e5dff9c52f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-21 17:39:00 +00:00
Yu Liu
de9f7f2f00 Merge "Access output files thru providers in Soong tests." into main am: fed2be9f98 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233572

Change-Id: If5bbef16025bfe3d95615398ac4afa97604daf29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-21 17:31:58 +00:00
Yu Liu
51c2231eab Access output files thru providers in Soong tests. 
The outputFiles field on ModuleBase will be removed next.

Bug: 358425833
Test: CI
Change-Id: I6d665ac13134d9278e5908f64c454366bc6bca5e
 2024-08-21 00:03:50 +00:00
Treehugger Robot
4b8d9fe6fd Merge "Restrict R8 -libraryjars refs for stable targets" into main am: 0fd3de6151 am: c59a128390 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233562

Change-Id: Id36a0aa0770003c87031028280fc9d36d8f3ef4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 22:42:38 +00:00
Treehugger Robot
c59a128390 Merge "Restrict R8 -libraryjars refs for stable targets" into main am: 0fd3de6151 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233562

Change-Id: I719d8ec110b692833aed69550f24eaa7159de6f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 22:37:26 +00:00
Treehugger Robot
0fd3de6151 Merge "Restrict R8 -libraryjars refs for stable targets" into main 2024-08-20 22:31:28 +00:00
Cole Faust
c8d5f7c440 Merge "Only add deps on java_binary's jni_libs on host" into main am: b4cc88efef am: 0821a8cf57 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3230584

Change-Id: I1ea5bb893ba6c855c0f923998931350c84bfb36a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 22:07:22 +00:00
Jared Duke
2246844554 Restrict R8 -libraryjars refs for stable targets 
The current R8 dex pipeline gathers transitive header jars to avoid
issues with missing class definitions. While this is benign for
platform targets not using a stable SDK, it can introduce issues
for stable targets (e.g., duplicate class defs for mainline framework
modules).

Bypass this transitive jar referencing for such targets that should
reference explicit, stable, stub API libraries. A follow-up change
will resolve specific issues with mainline system server targets.

Bug: 360905238
Test: m
Change-Id: I11a136d33ca9dd0dfff436c7045bf1807d17b1e7
 2024-08-20 20:45:35 +00:00
Cole Faust
0821a8cf57 Merge "Only add deps on java_binary's jni_libs on host" into main am: b4cc88efef 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3230584

Change-Id: I5a6588ee4724f6b128e0e2ed5092b3f52c57996c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-20 20:13:16 +00:00
Cole Faust
3dac486013 Only add deps on java_binary's jni_libs on host 
The jni_libs property of java_binary is documented to only install
the jni libraries on host. However, it was adding installable
deptag deps on those libraries, even if they were for device. This
caused soong to emit installation rules for the jni libraries, causing
them to be installed to the staging directory, but not emitting
proper information to make, so they wouldn't be included on the built
partitions.

Only install them if the module is built for host, so that they don't
erroneously appear in the staging directory.

Bug: 344695913
Test: Presubmits
Change-Id: Ic40b4fc6d7dbd51c03b08e28037be5428db49c33
 2024-08-20 11:44:04 -07:00
Treehugger Robot
d319ce79e6 Merge changes Ia0e1b307,I63c7c33e into main am: a5289ac9ef am: 903a500065 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216639

Change-Id: I21ed0479f96986058353f5942ebc1030547eab48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-17 05:04:18 +00:00
Treehugger Robot
903a500065 Merge changes Ia0e1b307,I63c7c33e into main am: a5289ac9ef 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216639

Change-Id: I5de31ae329756b4fd028e58e1bf9299eb3ad8347
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-17 04:43:09 +00:00
Treehugger Robot
a5289ac9ef Merge changes Ia0e1b307,I63c7c33e into main 
* changes:
  Define unstable container
  Define additional exception functions for container enforcement
 2024-08-17 04:07:00 +00:00
Jihoon Kang
0f3b1a7288 Define unstable container 
Unstable container marks modules that are static reverse dependencies of
"framework-minus-apex". These modules contain unstable implementation
details of the platform, and should not be accessed by the CTS tests.

Test: m nothing
Bug: 338660802
Change-Id: Ia0e1b3070f0f7b2c1b9c27306323e2428d9722ca
 2024-08-16 22:57:57 +00:00
Jihoon Kang
224ea08ee6 Define additional exception functions for container enforcement 
These exception functions allow restriction to be loosened for some
inter-container dependencies.

Note that these functions are still no-op. Restriction enforcement will
be done in the child change.

Test: m nothing
Bug: 338660802
Change-Id: I63c7c33e33f271d4c2a84cc6070eb4896e030ab4
 2024-08-16 22:57:39 +00:00
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
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
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
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
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
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
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
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
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
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
Jihoon Kang
889ca61691 Correct the name of the android.car.builtin module that is instrumented am: 6de6d7267f am: ca43c1fe44 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3219097

Change-Id: Ibf692f74bb289082c71764d38cb6a66ac155b621
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-14 19:10:15 +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
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
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
ac93739762 Merge "Merge SingletonProviderContext with OtherModuleProviderContext" into main am: 246b43049c am: 73282e8129 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3216676

Change-Id: Ic5fa82e4179f922e35479e527a392db141a973c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-13 16:38:05 +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
663e4508dc Merge SingletonProviderContext with OtherModuleProviderContext 
Bug: 358425833
Test: CI
Change-Id: I8e3f40dc3cfc5337008b419801f8e6bf2d48e8b2
 2024-08-12 22:50:19 +00:00
Colin Cross
bb5c9f5d82 Merge changes If313580b,I68d50d68 into main am: 08b6061539 am: 6bdec0cbe6 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3214342

Change-Id: Ie9dd3fc7d9d901150257108b92d8ce4079796b44
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-08-12 18:46:24 +00:00