Commit Graph

86054 Commits

Author SHA1 Message Date
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
Android Build Coastguard Worker
7b3a472e14 Snap for 12378824 from 328a23eb40 to 24Q4-release
Change-Id: Ib381b9476ac0c9447ca586c6967baa5a882c54b5
2024-09-17 23:00:55 +00:00
Florian Mayer
1cab1ece0a Run bionic tests for cc toolchain changes am: 5c441cea7a am: affe21610e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3270971

Change-Id: I6cc3f7df43699eec8c5b051fe6168eac27c416d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 22:52:41 +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
fb5934f9c1 Merge changes I41978037,I19e8a9e8 into main am: 809aaeb90b am: df86e9ee4f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3266866

Change-Id: I443bda3a9b043bf198ba9121e9916e9715cc6977
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 21:17:49 +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
328a23eb40 Merge "Convert test mutators to TransitionMutators" into main am: e95232426d am: b8cc10da46
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268014

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

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

Change-Id: I263ba6640f136429c3c3238642c8980e4b0a921b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 19:33:04 +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
8c0c9b73ef Merge "Pass the common sources rsp file as --common_srcs to extractor" into main am: 1c8c5698ec am: cc64154a60
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3267541

Change-Id: I57c34e05354db9c106a086dc8b5aab4ac85b089e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 18:10:52 +00:00
Colin Cross
b032510100 Merge "Convert arch and os mutators to TransitionMutators" into main am: 1531a12d2d am: 906856c785
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3262266

Change-Id: I18e45ebdf7d292619664cf91918ae3592a31122a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 18:09:01 +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
7d37960e1f Merge "Revert^12 "Enable dex container (DEX v41) for the whole system"" into main am: 9d96d1f186 am: 0eff90b320
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3212295

Change-Id: I48da5f8c2753499099a148a0c38ced3a8c52cc7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-17 15:32:14 +00: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
9ff16fa53e Enable Rust host coverage. am: d141912806 am: b88010cb9c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3063651

Change-Id: I5dca74f537f098c21f65f3ea9cb7858b2313bdcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-16 23:03:21 +00: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
Android Build Coastguard Worker
19bec14a5f Snap for 12369952 from 19256badc5 to 24Q4-release
Change-Id: I1fde3b7302ca549d25945af7e6836c48222d5b53
2024-09-14 22:35:19 +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
Android Build Coastguard Worker
8060b88142 Snap for 12368321 from 687dbd1cfd to 24Q4-release
Change-Id: I710b8a73242511517c4f91cbad2cf163b218df8e
2024-09-14 01:00:48 +00:00
Treehugger Robot
19256badc5 Merge "Prevent evaluating configurable properties before the defaults mutator" into main am: 0bfceee178 am: 268959a55b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268013

Change-Id: I2b5ea50925f00594c94aa61c60f92dbccf86e960
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-14 00:41:42 +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
05769c76d2 Merge "[Ravenwood] Support fonts files and data files" into main am: e372d287c0 am: 004b8fa8fe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268351

Change-Id: Ie4477423aaa9ef38c9995b0fcbc6f3c08b3cb854
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-14 00:12:13 +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
fed2df02fa Merge "BPF: rename bpf_defaults to bpf_cc_defaults" into main am: d0ea163941 am: 482bad125d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3268011

Change-Id: I550ac4386c056ef4ac04b73f25ecd05707b6f3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 23:03:36 +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