Commit Graph

85346 Commits

Author SHA1 Message Date
Treehugger Robot
5d0a9316c1 Merge "Add a unit test for class loader context with java_sdk_library impl lib" into main am: e2aeb50e49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3272612

Change-Id: Ib533469e7a619b2edcbe105cf096d8e03857bfbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 23:59:12 +00:00
Treehugger Robot
e2aeb50e49 Merge "Add a unit test for class loader context with java_sdk_library impl lib" into main 2024-09-18 23:51:25 +00:00
Treehugger Robot
2b47ef4dc2 Merge "Remove exported_java_libs from prebuilt_apex/apex_set module types" into main am: c5459aa57f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3272110

Change-Id: I3e7cb2a0f771d8f66128f007155a8b98f754568d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 23:03:31 +00:00
Treehugger Robot
c5459aa57f Merge "Remove exported_java_libs from prebuilt_apex/apex_set module types" into main 2024-09-18 22:59:25 +00:00
Jihoon Kang
e246bb7eca Add a unit test for class loader context with java_sdk_library impl lib
This test case tests the behavior added with aosp/3267383

Test: m nothing --no-skip-soong-tests
Bug: 366572133
Change-Id: Id7df3b76e6ef4880ac14e55bf8e0d81597d10055
2024-09-18 22:26:22 +00:00
Spandan Das
1896fd6006 Remove exported_java_libs from prebuilt_apex/apex_set module types
`exported_java_libs` provide information to soong about which .jars in a
prebuilt .apex need to be deapexed. This property is not used today,
since the only use case for deapexing is for dexpreopt, and dexpreopt is
done using bootjars (encapsulated using
`exported_bootclasspath_fragments`) and systemserver jars (encapsulated
using `exported_systemserverclasspath_fragments`)

Test: go test ./apex
Change-Id: I4ceec74aa11d8e32ccfb0bab29a4489cf8b3fc3d
2024-09-18 21:49:14 +00:00
Yu Liu
69afa4b020 Merge "Add a system test to check the mk and ninja files generated by incremental build." into main am: 3249ac6d3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3266053

Change-Id: Id6b908d4abd02309b0706ff8094b9baa6bd09632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 20:51:46 +00:00
Yu Liu
3249ac6d3f Merge "Add a system test to check the mk and ninja files generated by incremental build." into main 2024-09-18 20:43:01 +00:00
Treehugger Robot
5f6634ec5f Merge "Stop tracking the ABI of "current"." into main am: 7a1386e65e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3273171

Change-Id: I4f89a78a9fdd85c58c9d7d51ad3859417ce13b9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 20:38:01 +00:00
Treehugger Robot
7a1386e65e Merge "Stop tracking the ABI of "current"." into main 2024-09-18 20:32:31 +00:00
Treehugger Robot
6c2a7e139d Merge "Convert trivial TopDown mutators to BottomUp" into main am: dbb3ef9ac2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3270769

Change-Id: I60bcb025c36e1961bcbff8176134a404a1dfebd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 20:10:44 +00:00
Treehugger Robot
dbb3ef9ac2 Merge "Convert trivial TopDown mutators to BottomUp" into main 2024-09-18 20:05:09 +00:00
Treehugger Robot
64179a0427 Merge "Enable object-size sanitizer for C++" into main am: 411346c919
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3259736

Change-Id: I36e74219c08a32bb5a3a4076fb8b86a9c5c421bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 19:51:42 +00:00
Treehugger Robot
411346c919 Merge "Enable object-size sanitizer for C++" into main 2024-09-18 19:44:30 +00:00
Dan Albert
2d0dce1fad Stop tracking the ABI of "current".
Bug: None
Test: deleted "current" ABI dumps, ran updater, they didn't come back
Change-Id: I50463c3016864fccc7713c141e6465c8ed0d7184
2024-09-18 19:34:32 +00:00
Makoto Onuki
9b00bf3ecf Merge "Fix resource-apk inclusion" into main am: 1fa2cf0f88
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3270523

Change-Id: I2fce88dccf8c339450a0dc245d71fedaa2ed4e8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 19:32:18 +00:00
Makoto Onuki
1fa2cf0f88 Merge "Fix resource-apk inclusion" into main 2024-09-18 19:12:56 +00:00
Yi Kong
76e99ad68e Enable object-size sanitizer for C++
This was previously disabled due to a bug in libc++'s __tree implementation. That bug has been fixed, so we can now enable this sanitizer.

Change-Id: Ibbdfbe843aa02ef31d2a10b0c6a87500b7f60b42
Test: presubmit
2024-09-18 18:43:26 +00:00
Treehugger Robot
5f2bd29169 Merge "Align CLC add context behavior between java_sdk_library and its impl lib" into main am: feeb6d1e7b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3267383

Change-Id: I76e843dbfe25f599bbca1464e24b3955a2e6b696
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 17:57:57 +00:00
Treehugger Robot
feeb6d1e7b Merge "Align CLC add context behavior between java_sdk_library and its impl lib" into main 2024-09-18 17:34:00 +00:00
Colin Cross
da279cfba4 Convert trivial TopDown mutators to BottomUp
Many TopDown mutators can be easily converted to BottomUp mutators,
which are easier to handle for incremental and partial analysis.

Bug: 367784740
Test: all soong tests pass
Test: no change to build.ninja
Flag: EXEMPT refactor
Change-Id: I82955e844ed0eb6680854678c0744ac5398eb7ba
2024-09-18 10:14:19 -07:00
Jihoon Kang
ddda6ea7d3 Align CLC add context behavior between java_sdk_library and its impl lib
This change allows the impl lib of java_sdk_library to call AddContext(...) instead of AddContextMap(...) and ensure that the behavior between the top level java_sdk_library and the impl lib is identical when creating the class loader context.

Test: CI && ABTD
Bug: 366572133
Change-Id: Ia0bc7558ca737fcd3ad4ed62b3190aa567aa103f
2024-09-18 16:46:38 +00:00
Rico Wind
2df97e944d Merge "Launch flag guarded always on optimized resource shrinking" into main am: 15c5e54de7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3241280

Change-Id: Ie86673bfe45a7b24ae450f52fb4a727495c64977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 08:04:13 +00:00
Rico Wind
15c5e54de7 Merge "Launch flag guarded always on optimized resource shrinking" into main 2024-09-18 07:31:54 +00:00
Zi Wang
a844d55c8e Merge "Create a singleton that generates an empty bp file" into main am: 26cd6dd780
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3270758

Change-Id: I7c06e47c96bcaa2959fcec679ebcc033c3dc9cf5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-18 00:22:52 +00:00
Zi Wang
26cd6dd780 Merge "Create a singleton that generates an empty bp file" into main 2024-09-18 00:05:37 +00:00
Neill Kapron
1b8244fd82 Merge changes from topic "libbpf_defaults" into main am: d47cfab05b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3270098

Change-Id: I309603b5bc1e591ba1c9a2cfcf500f2dd4e259ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 23:16:59 +00:00
Neill Kapron
d47cfab05b Merge changes from topic "libbpf_defaults" into main
* changes:
  Soong: libbpf_prog: add support for header_libs
  Soong: libbpf_prog: Add defaults support
2024-09-17 23:03:33 +00:00
Florian Mayer
affe21610e Run bionic tests for cc toolchain changes am: 5c441cea7a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3270971

Change-Id: I9774e6b81a703671b5ece36aef7a845ea06296b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 22:37:27 +00:00
mrziwang
2aafdc5f9c Create a singleton that generates an empty bp file
This singleton will be used to generate a bp file based on
make-based product config later.

Test: m and CI
Bug: 367418637
Change-Id: I98caea5419f1facd3fa9ca5c6389d16a7aa2ce5d
2024-09-17 14:56:43 -07:00
Florian Mayer
5c441cea7a Run bionic tests for cc toolchain changes
Change-Id: Id26e2f6ff360abe35ead3a47055ba69e10ace033
2024-09-17 21:25:14 +00:00
Treehugger Robot
df86e9ee4f Merge changes I41978037,I19e8a9e8 into main am: 809aaeb90b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3266866

Change-Id: I0ea36a81d256d4a82124e4266818a1c8b8b135ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 20:52:19 +00:00
Treehugger Robot
809aaeb90b Merge changes I41978037,I19e8a9e8 into main
* changes:
  Properly initialize android_system_image modules
  Add otherModuleProvider to ConfigurableEvaluatorContext
2024-09-17 20:07:08 +00:00
Colin Cross
b8cc10da46 Merge "Convert test mutators to TransitionMutators" into main am: e95232426d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268014

Change-Id: I82dad1df821a9cae5f4a049d83171ea116b9d7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 19:17:53 +00:00
Makoto Onuki
df6d6e8ffe Merge "Make compat-config to generate output files too" into main am: a191ef3c54
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3270756

Change-Id: Ia9cc36f831b7c4a7d138c2f77a4c524d1b4a4365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 19:15:39 +00:00
Treehugger Robot
8a54e5b1c2 Merge "Soong: BPF: add defaults support and local include" into main am: 2ad497a39d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3249485

Change-Id: I43f4b743a478f3138c5b6fc4e952e8d1e25f50cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 19:14:23 +00:00
Colin Cross
e95232426d Merge "Convert test mutators to TransitionMutators" into main 2024-09-17 19:05:06 +00:00
Neill Kapron
3cc44de313 Soong: libbpf_prog: add support for header_libs
Add header_libs support for libbpf_prog modules.

Test: TH / manual
Bug: 359646531
Change-Id: I9e705645582ec12bfa0a2e388d0049bb472456e3
Signed-off-by: Neill Kapron <nkapron@google.com>
2024-09-17 18:33:46 +00:00
Cole Faust
2cfe696f4c Properly initialize android_system_image modules
android_system_image just passed its embedded filesystem module to
InitAndroidModule (transitively via initFilesystemModule). This meant
that ModuleBase.module was pointing to the filesystem module, not
the system image module. This was a problem for the new "changeable
configuration" feature I'm working on, but you can also more readily
see the issue if you add a GenerateAndroidBuildActions function to
android_system_image: it won't be called.

Bug: 361816274
Test: Presubmits
Change-Id: I41978037b81910309a000dc1bba327e513ba5dce
2024-09-17 11:31:14 -07:00
Makoto Onuki
a191ef3c54 Merge "Make compat-config to generate output files too" into main 2024-09-17 18:29:23 +00:00
Treehugger Robot
2ad497a39d Merge "Soong: BPF: add defaults support and local include" into main 2024-09-17 18:25:12 +00:00
Treehugger Robot
cc64154a60 Merge "Pass the common sources rsp file as --common_srcs to extractor" into main am: 1c8c5698ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3267541

Change-Id: I49e9cf27c697bcc72e3a68960b9a6e8c5e8b17f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 18:06:27 +00:00
Treehugger Robot
1c8c5698ec Merge "Pass the common sources rsp file as --common_srcs to extractor" into main 2024-09-17 17:49:54 +00:00
Colin Cross
906856c785 Merge "Convert arch and os mutators to TransitionMutators" into main am: 1531a12d2d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3262266

Change-Id: I1707a33f7037ee5c36bf7ce1b2b44ca1cef7a9b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 17:46:56 +00:00
Colin Cross
1531a12d2d Merge "Convert arch and os mutators to TransitionMutators" into main 2024-09-17 17:06:14 +00:00
Makoto Onuki
ed392f7097 Fix resource-apk inclusion
- We used to include the "install" files, but we really should be using
"output" files instead.

- Also supports a new "inst_resource_apk" property, which is another APK
that's loaded as resources of the instrumentation app itself.

Flag: EXEMPT host test change only
Bug: 292141694
Test: m nothing --no-skip-soong-tests
Test: manual test with a local test module change and make sure
    the second apk exists

Change-Id: Ibd3f9d4a1cbc0f805b2294605ae8bc06fdf53b75
2024-09-17 10:03:24 -07:00
Makoto Onuki
ca678c4a36 Make compat-config to generate output files too
Flag: EXEMPT host test change only
Bug: 367706429
Test: m nothing --no-skip-soong-tests
Test: `m ravenwood-runtime` and make sure out/host/linux-x86/testcases/ravenwood-runtime/ravenwood-data/
    has framework-platform-compat-config.xml and services-platform-compat-config.xml
Change-Id: I92b545c480890815cd886b8ecf50ed99ffe7eea1
2024-09-17 09:53:33 -07:00
Ulya Trofimovich
0eff90b320 Merge "Revert^12 "Enable dex container (DEX v41) for the whole system"" into main am: 9d96d1f186
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3212295

Change-Id: Iec3f740a25465564548f8d416c380a8a917c143d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 15:06:18 +00:00
Ulya Trofimovich
9d96d1f186 Merge "Revert^12 "Enable dex container (DEX v41) for the whole system"" into main 2024-09-17 14:01:55 +00:00
Colin Cross
d27205e8da Convert test mutators to TransitionMutators
Convert various mutators in tests to TransitionMutators.

Bug: 319288033
Flag: EXEMPT refactor
Test: all soong tests pass
Change-Id: I1da55889c391582a7c825c118c5988ec27820237
2024-09-16 17:00:39 -07:00