Commit Graph

85325 Commits

Author SHA1 Message Date
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
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
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
Colin Cross
8bbc3d5a30 Convert arch and os mutators to TransitionMutators
Replace archMutator and osMutator with TransitionMutators.

Bug: 319288033
Flag: EXEMPT refactor
Test: all soong tests pass
Test: no change to out/soong/*.ninja
Change-Id: I92a4d7c895dd79f1dd8064d0ca90e7010b563525
2024-09-16 17:00:39 -07:00
Yifeng Zeng
b88010cb9c Enable Rust host coverage. am: d141912806
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3063651

Change-Id: I71c626d30a61ee34a884a37306655c3414d63de7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 22:43:19 +00:00
Cole Faust
55b56feb86 Add otherModuleProvider to ConfigurableEvaluatorContext
So that it can make decisisons based on a provider set by the
base config mutator.

Bug: 361816274
Test: m nothing
Change-Id: I19e8a9e800dfabcd05740f9c0ed5db833c5b2377
2024-09-16 15:10:05 -07:00
Neill Kapron
4f1f049f5c Soong: libbpf_prog: Add defaults support
Add defaults support for libbpf_prog module type.

Test: TH / manual
Bug: 359646531
Change-Id: Idc2977d3cf6efe62968e0eac9fc592d0cf0b3beb
Signed-off-by: Neill Kapron <nkapron@google.com>
2024-09-16 20:12:14 +00:00
Ulya Trofimovich
5bb46810a5 Revert^12 "Enable dex container (DEX v41) for the whole system"
This reverts commit 78fccd9380.

Reason for revert: test failure in can no longer be reproduced.

Bug: 353452237
Change-Id: I7cf926342efc612b4026d89df12078c018ede7b9
2024-09-16 18:58:53 +00:00
Yifeng Zeng
d141912806 Enable Rust host coverage.
Bug: 297082598
Bug: 330591720
Test: atest logger_host_unit_tests --experimental-coverage
Change-Id: Iec6db35b88e2812d3af69863e74b0acf138b04df
2024-09-14 05:21:18 +00:00
Treehugger Robot
268959a55b Merge "Prevent evaluating configurable properties before the defaults mutator" into main am: 0bfceee178
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268013

Change-Id: Ib77c5c0a30267e649f0c37bc131825890bee8b37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-14 00:19:52 +00:00
Treehugger Robot
0bfceee178 Merge "Prevent evaluating configurable properties before the defaults mutator" into main 2024-09-13 23:56:18 +00:00
Treehugger Robot
004b8fa8fe Merge "[Ravenwood] Support fonts files and data files" into main am: e372d287c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268351

Change-Id: I5e5ed7abbc0ae580f22add3bba37adb9c1c7067e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 23:44:23 +00:00
Treehugger Robot
e372d287c0 Merge "[Ravenwood] Support fonts files and data files" into main 2024-09-13 23:27:25 +00:00
Maciej Żenczykowski
482bad125d Merge "BPF: rename bpf_defaults to bpf_cc_defaults" into main am: d0ea163941
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268011

Change-Id: Ic615724aca37eec54c4b9d79f1a2dac294ed9325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 22:50:19 +00:00
Maciej Żenczykowski
d0ea163941 Merge "BPF: rename bpf_defaults to bpf_cc_defaults" into main 2024-09-13 22:15:27 +00:00
Spandan Das
67136e14f3 Pass the common sources rsp file as --common_srcs to extractor
This additional metadata allows the indexer to differentiate between
platform specific and platform agnostic kotlin code.

Bug: 3266381
Test: ran the indexer on `kotlinx_serialization_core` java_library
Change-Id: I860552808198cafa95fe0d5b6faa725b985e24d0
2024-09-13 22:12:45 +00:00
Treehugger Robot
50d7d19f7b Merge "Add links to partner docs for presigned apks" into main am: ad6a20f3a1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268012

Change-Id: I2fe7e1ff79bc978c4e2054e0d6cb71e59e1183ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 21:34:12 +00:00
Aditya Kumar
0427340d48 Merge "Disable -Wno-deprecated-dynamic-exception-spec until the warning is fixed in libc++abi header files" into main am: e5cb9c659b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3264777

Change-Id: Ieaf814cfb2c01210e8b260406bf50e32668796b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 21:33:12 +00:00
Treehugger Robot
ad6a20f3a1 Merge "Add links to partner docs for presigned apks" into main 2024-09-13 21:16:42 +00:00
Aditya Kumar
e5cb9c659b Merge "Disable -Wno-deprecated-dynamic-exception-spec until the warning is fixed in libc++abi header files" into main 2024-09-13 21:10:04 +00:00
John Wu
680cd73e1a [Ravenwood] Support fonts files and data files
Add support to include font files into ravenwood_libgroup. Also make ravenwood data property to accept paths instead of module name. 

Bug: 292141694
Flag: EXEMPT host side change only
Test: $ANDROID_BUILD_TOP/frameworks/base/ravenwood/scripts/run-ravenwood-tests.sh
Change-Id: Ida5ef0230d2cc59fa1209199168c6c35e4842fbd
2024-09-13 20:59:05 +00:00
Cole Faust
d706709bf0 Prevent evaluating configurable properties before the defaults mutator
So that we can change the configuration after the defaults mutator
has run.

Bug: 361816274
Test: Presubmits
Change-Id: I550088b2555d275a86b5dd4d57e85a9ece859233
2024-09-13 13:37:59 -07:00
Treehugger Robot
da8bc7929e Merge changes from topic "flag_application_manifest" into main am: c2ea958b3d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3260724

Change-Id: I9d6d4446ab53bad4a9bea493afd7a5bd9e653ec5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 20:11:51 +00:00