Commit Graph

81864 Commits

Author SHA1 Message Date
Zi Wang
78ffdd47a6 Move jarjar repackage action before combine action
With this change, the jarjar repackage actions are only on
the local classes of each module instead of the combined jar
that contains the static libs. The static libs don't need
jarjar repackage action on this module level because it has
been repackaged when building itself.

This change also removes the skip_jarjar_repackage property
since it's incompatible with this change. Actually skipping
jarjar repackage on a dep may result in incomplete repackage
on the module output.

Test: CI and observing the build time of SystemUIGoogle
Bug: 328067025
Ignore-AOSP-First: Will cp to aosp
Change-Id: I476d959af025c46d2ba6d3f48ea378a086666a33
2024-03-21 11:48:26 -07:00
Cole Faust
7441750d88 Merge "Handles if a space is encountered while parsing the rule" into main am: 3e8bd45638 am: ac2181a54e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2975671

Change-Id: Ia2fd07a44dd47537e30aa1069022b45b13d7f78f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19 17:58:27 +00:00
Yu Liu
6c8e0b6bba Merge "Pass "--container" to aconfig create-cache" into main 2024-03-19 17:51:22 +00:00
Cole Faust
ac2181a54e Merge "Handles if a space is encountered while parsing the rule" into main am: 3e8bd45638
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2975671

Change-Id: Ifc9741be2b54da07aebdb11ff71e8c7df749124e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19 17:42:52 +00:00
Cole Faust
3e8bd45638 Merge "Handles if a space is encountered while parsing the rule" into main 2024-03-19 17:21:02 +00:00
Treehugger Robot
2a1e98dc60 Merge "Revert^9 "Enable dex container (DEX v41) for the whole system"" into main am: 84fedd36a4 am: 16ebf41398
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005894

Change-Id: Ic30a3902facd682af2d91bfe70650c526098d6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19 01:51:48 +00:00
Treehugger Robot
16ebf41398 Merge "Revert^9 "Enable dex container (DEX v41) for the whole system"" into main am: 84fedd36a4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005894

Change-Id: Ic8c78a634bbfd8a9f9e44c0afe3fe5a743de7723
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-19 01:34:58 +00:00
Treehugger Robot
84fedd36a4 Merge "Revert^9 "Enable dex container (DEX v41) for the whole system"" into main 2024-03-19 01:20:15 +00:00
Treehugger Robot
9a0be32d7f Merge "Generate wrapper lib.rs with one module per sysprop file." into main am: e430878f48 am: c229db6be3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3000957

Change-Id: I716516bbf15306b2457af16687a8feb05beacb90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-18 23:12:03 +00:00
Treehugger Robot
c229db6be3 Merge "Generate wrapper lib.rs with one module per sysprop file." into main am: e430878f48
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3000957

Change-Id: I15c98dfb1e54e573e361c7a1aee6f63446ea58b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-18 22:57:19 +00:00
Treehugger Robot
e430878f48 Merge "Generate wrapper lib.rs with one module per sysprop file." into main 2024-03-18 22:41:05 +00:00
Yu Liu
4bf8a3d227 Merge "Support rust in aconfig mode validation." into main am: 73cf0e87b4 am: e4128bdd13
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3001754

Change-Id: I4c42da933a6c64be282fafb7e1226c0098e028db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-18 21:21:46 +00:00
Yu Liu
e4128bdd13 Merge "Support rust in aconfig mode validation." into main am: 73cf0e87b4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3001754

Change-Id: I3bc128985c3957c525420e4ffa846140f7a31582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-18 21:04:30 +00:00
Yu Liu
73cf0e87b4 Merge "Support rust in aconfig mode validation." into main 2024-03-18 20:49:35 +00:00
Andrew Walbran
acd75d2b50 Generate wrapper lib.rs with one module per sysprop file.
This required moving to a SourceProvider for the Rust library. With the
previous approach only the first input file was being used.

Bug: 270547306
Test: Built libplatformproperties_rust, looked at output
Change-Id: I1070655abc071e099a42bc4be61cc080902e31c1
2024-03-18 19:02:04 +00:00
Yuncheol Heo
113654faca Revert^9 "Enable dex container (DEX v41) for the whole system"
This reverts commit b92a4e1ca9.

Reason for revert: tracking the test failure b/329907267

Change-Id: Id3fa8471f073e0ec705fd0aba653b032ff82f9ad
2024-03-18 17:41:12 +00:00
Yu Liu
b75ed0f2d8 Pass "--container" to aconfig create-cache
Bug: 328823994
Test: unit tests and manual tests locally.

Ignore-AOSP-First: It is easier to detect all the mismatch in internal
master.

Change-Id: I096877015b78786639376b279a9be5d07594d92e
2024-03-18 17:01:49 +00:00
Spandan Das
a249574eed Merge "Support mechanism to select a specific version of module sdk prebuilt" into main am: c36d579c2b am: 91c8756bd2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005213

Change-Id: If71c7c2184bd902adb32651110ce295c675bb328
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-18 16:45:15 +00:00
Spandan Das
91c8756bd2 Merge "Support mechanism to select a specific version of module sdk prebuilt" into main am: c36d579c2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005213

Change-Id: I57d60aca6bb6ada6c5ecbc6c0262d60c4ccd8601
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-18 16:25:59 +00:00
Spandan Das
c36d579c2b Merge "Support mechanism to select a specific version of module sdk prebuilt" into main 2024-03-18 15:55:51 +00:00
Spandan Das
e4c911e6fc Support mechanism to select a specific version of module sdk prebuilt
This CL is the platform_compat_config equivalent of aosp/2928483.

{prebuilt_}_platform_compat_config are collated by
`global_compat_config` via a singleton. The collated data is then used
in some CTS tests. At ToT, we ensure that the collation ignores the
platform_compat_config of prebuilt when source is selected, and vice
versa.

With trunk stable, multiple versions of prebuilt apexes and prebuilt
platform compat configs might exist in the tree. This CL uses
`Source_module_name` to hide the platform compat configs of the
unselected prebuilt apexes.

Bug: 322175508

Test: Added a unit test
Change-Id: Iafdde8fc0458b37b3ccde25433070936f144915c
2024-03-16 01:41:12 +00:00
Treehugger Robot
7d53941629 Merge "Create rule to generate the exportable api files when checkapi is disabled" into main am: ce1b16313e am: 7793b9460e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3003278

Change-Id: Ib01a8d6bfb9f7469f1e574975b8911e8687cd084
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-16 00:35:51 +00:00
Treehugger Robot
7793b9460e Merge "Create rule to generate the exportable api files when checkapi is disabled" into main am: ce1b16313e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3003278

Change-Id: Iad6d29d40e9ff9b8efee452b0a2b35895c78704b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-16 00:15:46 +00:00
Treehugger Robot
ce1b16313e Merge "Create rule to generate the exportable api files when checkapi is disabled" into main 2024-03-15 23:58:13 +00:00
Cole Faust
1686ec0047 Merge "Remove SandboxingDenyPathList" into main am: 718804dd84 am: 4c2bfbff2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005216

Change-Id: I1cfaa67d0bf5bacc0d7a37a01683e8468fda63da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 22:36:55 +00:00
Jihoon Kang
36c3d96b65 Create rule to generate the exportable api files when checkapi is disabled
WITHOUT_CHECK_API environment variable enables the checkapi to be
removed from the critical path. The variable is rarely used within AOSP,
but the downstream vendors may depend on it, in order to improve the
build performance given that the api signature file through metalava is
a resource costly task.

Currently, the exportable api files / removed api files are not
generated when checkapi is disabled, but a module may depend on the
exportable api files when a checkapi is disabled. In order to prevent
the missing build rules error in this case, generate the rule to copy
the checked in api file / removed api file to the exportable api file /
removed api file to prevent build errors.

This change also fixes the error message when the OutputFiles(string)
api file is null, to correctly inform the user the error.

Test: m BUILD_FROM_SOURCE_STUB=true WITHOUT_CHECK_API=true && inspect ninja path and verify that "non-updatable-exportable-current.txt" depends on the generated exportable api file.
Bug: 329374072
Change-Id: I24f88d450fb46b6ea9d5920d83617d8228edd34b
2024-03-15 22:30:56 +00:00
Cole Faust
4c2bfbff2b Merge "Remove SandboxingDenyPathList" into main am: 718804dd84
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3005216

Change-Id: I166165c330f57249ef4800149cbadbfed3424ce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 22:21:09 +00:00
Cole Faust
718804dd84 Merge "Remove SandboxingDenyPathList" into main 2024-03-15 21:35:36 +00:00
Treehugger Robot
0f447fdc91 Merge "rustc-1.76.0 Build 11569723" into main am: f7db7153a3 am: 52b9ada510
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3002150

Change-Id: I04d28a543250d06922d8f1c0f22ae22e2bd2f3f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 21:06:41 +00:00
Treehugger Robot
52b9ada510 Merge "rustc-1.76.0 Build 11569723" into main am: f7db7153a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3002150

Change-Id: I4a65d5965378b17112e55c9d3328e77e5d5ab0aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 20:50:51 +00:00
Treehugger Robot
f7db7153a3 Merge "rustc-1.76.0 Build 11569723" into main 2024-03-15 20:36:23 +00:00
Cole Faust
e762b94fe7 Remove SandboxingDenyPathList
It's no longer used.

Bug: 307824623
Test: m nothing --no-skip-soong-tests
Change-Id: I181de9d852f4025c6c5829cc4941ffb705f7cb50
2024-03-15 19:50:03 +00:00
Yu Liu
c888460e5d Support rust in aconfig mode validation.
Bug: 323071835
Test: Unit tests
Change-Id: I6de2a6fe1618e21c9aab728e6d77c6b0c6ce33df
2024-03-15 18:48:38 +00:00
Cole Faust
cba5b144a0 Merge changes from topic "import_make_staging_dir" into main am: b9ae285b55 am: d1ba04556c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3001497

Change-Id: I53712fda9c59466b2275cedf58911e9b683b8339
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 18:16:16 +00:00
Cole Faust
dd30c57d54 Don't use zip files when creating filesystems am: 3b806d3b88 am: a55678c6cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2999197

Change-Id: I3f52f4fa030e11f875b4a108c175fd844c305642
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 18:16:12 +00:00
Cole Faust
d1ba04556c Merge changes from topic "import_make_staging_dir" into main am: b9ae285b55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3001497

Change-Id: I8f6a352242fcfe740ca59eee39014fe965dff770
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 17:56:33 +00:00
Cole Faust
a55678c6cf Don't use zip files when creating filesystems am: 3b806d3b88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2999197

Change-Id: Iba02f1cfa4545f30a772eb36537f40950a8fd2ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 17:56:29 +00:00
Cole Faust
b9ae285b55 Merge changes from topic "import_make_staging_dir" into main
* changes:
  Add include_make_built_files
  Don't use zip files when creating filesystems
2024-03-15 17:34:26 +00:00
David Srbecky
416175d857 Merge "Revert^8 "Enable dex container (DEX v41) for the whole system"" into main am: d10d54af71 am: a561fc032a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2921345

Change-Id: I5a174f90f084a3d7b916b2d4ec473a2de7e53be5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 16:43:09 +00:00
David Srbecky
a561fc032a Merge "Revert^8 "Enable dex container (DEX v41) for the whole system"" into main am: d10d54af71
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2921345

Change-Id: Ic7f66d6d082f1851e6a80b8f23d03be01cc020bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 16:21:42 +00:00
David Srbecky
d10d54af71 Merge "Revert^8 "Enable dex container (DEX v41) for the whole system"" into main 2024-03-15 15:42:48 +00:00
David Fu
818028bfbb [automerger skipped] Changed assignee to triage_assignee in fuzzconfig am: f5bf51a85c -s ours
am skip reason: Merged-In Ifdf4e8a3d855c414c906d249674411f4f4b88396 with SHA-1 44fc9a826b is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/26541942

Change-Id: I3770a6a60e157949b430c7ec5c44ce2e3d10b2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 07:51:44 +00:00
Jeongik Cha
51cdd8febd Merge "//visibility:any_partition can be used with another visibility field" into main am: 8b0192d031 am: 77b0861e96
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2999577

Change-Id: I901a973754d8f7c06e7f6869e1dc9a0cee0b43df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 03:10:44 +00:00
Treehugger Robot
1deecc9f9b Merge "Delete jmod workDir" into main am: f34748af55 am: 834f963398
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3004910

Change-Id: I3ea7ec38a43b83045ed4cab86249b069f44b1423
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 03:10:25 +00:00
Jeongik Cha
77b0861e96 Merge "//visibility:any_partition can be used with another visibility field" into main am: 8b0192d031
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2999577

Change-Id: Icb12ba87b3c06e1953ed5f12f3cb6275ce1dc285
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 02:51:41 +00:00
Treehugger Robot
834f963398 Merge "Delete jmod workDir" into main am: f34748af55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3004910

Change-Id: Ibd7b645c096f22caa004405783de6e75386e2954
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-03-15 02:51:25 +00:00
Jeongik Cha
8b0192d031 Merge "//visibility:any_partition can be used with another visibility field" into main 2024-03-15 02:51:00 +00:00
Treehugger Robot
f34748af55 Merge "Delete jmod workDir" into main 2024-03-15 02:35:04 +00:00
Jeongik Cha
31be352612 //visibility:any_partition can be used with another visibility field
Bug: 321000103
Test: m nothing
Change-Id: I2f65ff4d51c65f974e2dc79c94dfefe180ddbfe4
2024-03-15 10:19:23 +09:00
Cole Faust
7ef61d76f8 Delete jmod workDir
Files in this directory aren't exposed to the rest of the build, so
deleting them saves some space. The `jmod create` command was also
producing non-deterministic files, which are not relevant because
they're not used anywhere else, but it makes it easier to find
non-determinism that matters if we delete them.

Test: Presubmits
Change-Id: I5d57826b438368f24a7a2a7ab1ccd6c16f240124
2024-03-14 18:15:28 -07:00