summaryrefslogtreecommitdiff
path: root/java
AgeCommit message (Collapse)Author
2025-03-24Merge "Add services.impl to legacyCorePlatformApiModules" into main Jared Duke
2025-03-24Merge "Revert "Make d8-on-eng a per-module opt-out"" into main am: 09f9e0f678 Priyanka Advani (xWF)
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3556063 Change-Id: I6b73df8a0a78e96d48d1f7a3d9e6f6ebac81279e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-24Merge "Revert "Make d8-on-eng a per-module opt-out"" into main Priyanka Advani (xWF)
2025-03-24Revert "Make d8-on-eng a per-module opt-out" Satish Yalla
Revert submission 3555366-eng-d8 Reason for revert: Droidmonitor created revert due to b/405397520. Will be verified through ABTD for standard investigation. Reverted changes: /q/submissionid:3555366-eng-d8 Change-Id: Idc27a646af8e726e74665fbbb80f6fc3e510625a
2025-03-21Merge "Quote zip2zip arg with a *." into main am: f4183ce252 Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3557046 Change-Id: If1734fdda905a08045f291f0f1ec7ac5c51de982 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-21Merge "Quote zip2zip arg with a *." into main Treehugger Robot
2025-03-21Quote zip2zip arg with a *. Jeff Hamilton
Test: m out/soong/.intermediates/vendor/unbundled_google/packages/MapsPrebuilt/Maps/android_common/jnis-stripped/Maps.apk Flag: EXEMPT build system change Change-Id: I8d4db4cb18c5e96e9fec7cd2abd3f3a4b611b1b1
2025-03-21Add services.impl to legacyCorePlatformApiModules Jared Duke
Swap out services for services.impl in the legacy API allowlist, as the new intermediate target contains the referencing Java srcs that feed into services. Bug: 212737576 Test: m Flag: EXEMPT build refactor Ignore-AOSP-First: New target not yet in AOSP Change-Id: I319ba001eb1d5f16141397cc89cbbe3bfe2f6d21
2025-03-20Merge "Make d8-on-eng a per-module opt-out" into main am: 6cf30e3595 Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3555644 Change-Id: I1e4a4b0e8588c3b4d0084b3ab87bfebd4e8149e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-20Make d8-on-eng a per-module opt-out LaMont Jones
Several modules use defaults that set `enabled`, rather than relying on the defaults. With this change, eng builds no use d8 instead of r8, with the exception of unit tests in prebuilts/r8. Bug: b/374975543 Test: manual, TH Change-Id: I377d354f005529d04fb9d9255afa73979935f091
2025-03-20Merge "Handle android_app_set in Soong built apkcerts.txt" into main am: ↵ Treehugger Robot
a03d23cae7 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3552799 Change-Id: I88e9b7b47fb52834abce76828538ed32ed0618e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-20Merge "Handle android_app_set in Soong built apkcerts.txt" into main Treehugger Robot
2025-03-19Merge "Use d8 when on eng builds" into main am: f6f98f8edb Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3550619 Change-Id: Ifa0552d9900de34677672adf41e7880345f5a474 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-19Handle android_app_set in Soong built apkcerts.txt Spandan Das
android_app_set modules contain presigned apks, and uses `extract_apks` to create an entry for each split apk in `LOCAL_APK_CERTS`, which then gets concatenated to apkcerts.txt when built using Make. This logic was previously not handled correctly in the new Soong implementation, causing build errors in partner workspaces. Bug: 396131789 Test: In partner-workspace, built the soong generated apkcerts.txt file Change-Id: I7dd0dcd6c992660d5a7e7d484b5d83dc06e051f3
2025-03-19Use d8 when on eng builds LaMont Jones
This is consistent with all of the other ways that eng builds are faster, but do not match the expected performance of user or userdebug builds. We still use r8 if a module has `optimize: { enabled: true,}`. Bug: b/374975543 Test: manual, TH Change-Id: I28c6de4472f4df1f791758294d45b67acc0a7b7c
2025-03-14Merge "Change CommonModuleInfoProvider to a pointer." into main am: ↵ Yu Liu
f2aacebb28 am: 7909c860f9 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3542441 Change-Id: I447ba2da2c55857d035bd2f10e10c7cdef5f1c6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-14Merge "Change CommonModuleInfoProvider to a pointer." into main Yu Liu
2025-03-14Merge "Revert "Baklava finalization special"" into main Treehugger Robot
2025-03-13Merge "Mark "Ravenwood-tests" and "robo-test" modules as being TestOnly and ↵ Treehugger Robot
top-level-tests for code coverage reporting." into main am: 87e16cb969 am: 630a570def Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3540861 Change-Id: Icde673189a93a9b8cd3fa3249ef15555e12d210f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-13Merge "Mark "Ravenwood-tests" and "robo-test" modules as being TestOnly and ↵ Treehugger Robot
top-level-tests for code coverage reporting." into main
2025-03-13Merge "Make the Extract_apk field configurable" into main am: b523863bfa am: ↵ Treehugger Robot
9f6f5ae58f Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3540011 Change-Id: I89327238944c9d46d219aa769fdf8dca046d6f66 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-13Change CommonModuleInfoProvider to a pointer. Yu Liu
Bug: 358427516 Test: Manually verified genereated ninja and mk files, unit tests. Change-Id: I53a6dd718232735decbeb93febfd269dd9449e86
2025-03-13Make the Extract_apk field configurable Xiaojie Zhu
Fixes: 403200239 Test: m nothing --no-skip-soong-tests Change-Id: Ibbe6a217d19522712f699adbfbcc6f63d730c7db
2025-03-13Revert "Baklava finalization special" Mårten Kongstad
This reverts commit 45fc16c6f7ef539943efa082450f160ac1075735. Baklava has been finalized and the prebuilts/sdk/36 directory has been created, and the version bumps have propagated to trunk. We no longer need to special case the call to metalava. Bug: 379105862 Test: presubmit Ignore-AOSP-First: special call to metalava does not exist in AOSP Change-Id: I2a49e917ce7f5ec43a189dd0fe910433a1c95332
2025-03-12Mark "Ravenwood-tests" and "robo-test" modules as being TestOnly and ↵ Ronald Braunstein
top-level-tests for code coverage reporting. Fixes: 402451184 Tests: m nothing --no-skip-soong-tests blueprint_tests Tests: go test ./java Tests: m all_teams && gqui from "flatten(out/soong/ownership/all_teams.pb, teams)" proto build/soong/android/team_proto/team.proto:AllTeams 'select teams.kind, count(*) where teams.test_only = true and teams.kind not like "%cc_%" group by teams.kind' +--------------------------+----------+ | teams.kind | count(*) | +--------------------------+----------+ | android_ravenwood_test | 37 | | android_robolectric_test | 118 | | android_test | 2230 | | android_test_helper_app | 2125 | ... Change-Id: Ib81b6d261a3088aed44ea4d74452f99ff0f3d587
2025-03-12Merge "Define an output file of runtime_resource_overlay" into main am: ↵ Treehugger Robot
c5f81d0306 am: 9dc2c0dcce Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3540039 Change-Id: If94abc3670cf94d70cc6830335c8c3fcf321e75e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-12Define an output file of runtime_resource_overlay Cole Faust
So that rros can be data of test modules. Test: go test Change-Id: I460a97fd9f430ec8e52ef6756d74b02693469d06
2025-03-11Merge "Expand TestSuiteInfoProvider to all test modules" into main am: ↵ Treehugger Robot
9697c5303c am: d7748c944f Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3537561 Change-Id: I813eeaee54a6157ae87c6cf8c285406892027be8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-11Merge "Add a trace_references_from dex optimization property" into main am: ↵ Treehugger Robot
b4d50380bf am: df76cb3493 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3534380 Change-Id: Id3e510384d85427e5e6f9eba9c0f47dc58e21ddd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-11Merge "Expand TestSuiteInfoProvider to all test modules" into main Treehugger Robot
2025-03-11Merge "Add a trace_references_from dex optimization property" into main Treehugger Robot
2025-03-11Expand TestSuiteInfoProvider to all test modules Cole Faust
Test suites have been historically only defined in the AndroidMk functions. But in soong-only builds, we don't run AndroidMk. It appears Colin already started making a TestSuiteInfo provider, but hadn't set it on all test modules yet. Expand it to all the test modules, and add export it to make so that make can check that it matches LOCAL_COMPATIBILITY_SUITES. Bug: 388850000 Test: m nothing Change-Id: Iee8959742117604fd560c95be60f3cb7cf3d9ae4
2025-03-11Add a trace_references_from dex optimization property Jared Duke
Introduce a new property `trace_references_from` in the optimize block. This field allows specifying a set of downstream targets from which to trace references when optimizing the current target. In practice, this requires explicit breaking of any cycles that might occur. A follow-up effort will explore doing this dynamically and implicitly for `libs` references onto an optimized target that enables this feature. Bug: 212737576 Test: m nothing Test: go test ./java Flag: EXEMPT bugfix Change-Id: I088bd8bf89403661a084a43b2822a6efbbc0294d
2025-03-10Merge "Convert WalkPayloadDeps to use ModuleProxy." into main am: 6994a51257 ↵ Yu Liu
am: 10e002f6bb Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3524292 Change-Id: I677fbe46f68d95ca56a7dbd451e7ee498403e708 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-10Merge "Convert WalkPayloadDeps to use ModuleProxy." into main Yu Liu
2025-03-10Merge "Rename CommonModuleInfoKey to be consistent with others." into main ↵ Yu Liu
am: a369dc0014 am: 0a4888dfae Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3482009 Change-Id: I9ffa4351297c3a2de5cd82b0cbe1d053580d14f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-10Merge "Do not propagate boot jars in CLC construction" into main am: ↵ Jihoon Kang
cfbdb0cec0 am: 8fe189d07b Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3529410 Change-Id: I107e376b657885c03ba1211db2b45338aba6f6ce Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-10Merge "Rename CommonModuleInfoKey to be consistent with others." into main Yu Liu
2025-03-10Merge "Do not propagate boot jars in CLC construction" into main Jihoon Kang
2025-03-07Convert WalkPayloadDeps to use ModuleProxy. Yu Liu
Bug: 377723687 Test: Unit tests and compare the ninja and mk files generated. Change-Id: If0d132c2310eb958c066747f9c16251cc24fedd0
2025-03-07Rename CommonModuleInfoKey to be consistent with others. Yu Liu
Bug: 377723687 Test: Unit tests and compare the ninja and mk files generated. Change-Id: I1ce8bc782666586633ded9cfaf1b9590e3c0efde
2025-03-07Merge "Use system server jar module stem instead of its name" into main am: ↵ Treehugger Robot
4a053d74d7 am: 1593b1644f Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3528460 Change-Id: Iee0dbeaeaa5450477eab11c6fe46f0a9ed243fd0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-07Merge "Add a soong wrapper for R8's tracereferences" into main am: ↵ Jared Duke
8b09c4b7b6 am: 79274d2e6b Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3529492 Change-Id: I4784a5c1247e4ccc7f58482264e8a476d16d12f0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-07Merge "Use system server jar module stem instead of its name" into main am: ↵ Treehugger Robot
4a053d74d7 Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3528460 Change-Id: If607f0f120d0487ca28de58716de62e7eac4771f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-07Merge "Use system server jar module stem instead of its name" into main Treehugger Robot
2025-03-07Merge "Add a soong wrapper for R8's tracereferences" into main am: 8b09c4b7b6 Jared Duke
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3529492 Change-Id: I0b9bdeee88b699e25f55b1cdb4426252ca3e8ee7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-07Merge "Add a soong wrapper for R8's tracereferences" into main Jared Duke
2025-03-07Use system server jar module stem instead of its name Luca Stefani
In the case a system server jar is added as a prebuilt its Name() will prepend prebuilt_ to the module name. By itself this doesn't cause any issue, but the format of PRODUCT_SYSTEM_SERVER_JARS expects the second part to match the "installed" jar and depending on that it fills the AllPlatformSystemServerJars, that now can't be indexed by the Name() of the prebuilt module. To solve the issue use the module stem as GetSystemServerDexLocation will construct a path based on that. Test: m, prebuilt felix-services passes dexpreopt check Change-Id: I7e61b958bb1772109446e56bad7a51dd81e8659e
2025-03-07Merge "Add support for R8 partial compilation in soong" into main am: ↵ Christoffer Adamsen
d30afaded2 am: 487fd7cedc Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3513210 Change-Id: I1f913b4a8878c7fbb4848d532594c6a0d15ba7b1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2025-03-07Merge "Add support for R8 partial compilation in soong" into main am: d30afaded2 Christoffer Adamsen
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3513210 Change-Id: I954e99b0a10678b52419f4155daf11c73b2a410b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>