Commit Graph

84858 Commits

Author SHA1 Message Date
Yu Liu
de9f7f2f00 Merge "Access output files thru providers in Soong tests." into main am: fed2be9f98
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233572

Change-Id: If5bbef16025bfe3d95615398ac4afa97604daf29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 17:31:58 +00:00
Hugo Drumond Jacob
7e93544aa4 Merge "Revert "Add a coverage suffix to avoid Ninja file regeneration."" into main am: 079871cd55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3235972

Change-Id: I24d859e2943847878bf71247c28d84821a541547
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 17:31:43 +00:00
Yu Liu
fed2be9f98 Merge "Access output files thru providers in Soong tests." into main 2024-08-21 17:27:21 +00:00
Hugo Drumond Jacob
079871cd55 Merge "Revert "Add a coverage suffix to avoid Ninja file regeneration."" into main 2024-08-21 17:20:34 +00:00
Treehugger Robot
da92d4238e Merge "Remove apexFilesForAndroidMk from prebuilt apex module types" into main am: 5f42006902
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233745

Change-Id: Ic7feff32335e4755eb9158ef95b0bbb62ade7068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 17:00:07 +00:00
Treehugger Robot
5f42006902 Merge "Remove apexFilesForAndroidMk from prebuilt apex module types" into main 2024-08-21 16:53:00 +00:00
Hugo Drumond Jacob
134fa5df00 Revert "Add a coverage suffix to avoid Ninja file regeneration."
Revert submission 3207217-emma-flip-time-saver

Reason for revert: b/361236607

Reverted changes: /q/submissionid:3207217-emma-flip-time-saver

Change-Id: I7b4dcd3f6e73e302a2c3ef7ed5c02f6345619463
2024-08-21 13:07:06 +00:00
Elliott Hughes
94f50b86d7 Merge "Use -fno-omit-frame-pointer for host linux." into main am: 9423b3f784
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3232822

Change-Id: I1e30441a63b6ae94482f66e1e9370b0d829bd78b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 12:32:22 +00:00
Elliott Hughes
9423b3f784 Merge "Use -fno-omit-frame-pointer for host linux." into main 2024-08-21 12:25:30 +00:00
Spandan Das
a18d42d324 Remove apexFilesForAndroidMk from prebuilt apex module types
This seems to be unused

Test: no diff in ninja file
Change-Id: Ib711294a4f30fe1db564e3b01d944e8813d0b4ac
2024-08-21 00:54:07 +00:00
Yu Liu
51c2231eab Access output files thru providers in Soong tests.
The outputFiles field on ModuleBase will be removed next.

Bug: 358425833
Test: CI
Change-Id: I6d665ac13134d9278e5908f64c454366bc6bca5e
2024-08-21 00:03:50 +00:00
Yu Liu
e5b9b5bccc Merge "Remove build target related fields from ModuleBase." into main am: 97bf07a2ef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233882

Change-Id: I33d14eca24d56f163132500f0557388e5ab457e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 23:27:18 +00:00
Yu Liu
97bf07a2ef Merge "Remove build target related fields from ModuleBase." into main 2024-08-20 23:23:24 +00:00
Cole Faust
c6c90e61a9 Merge "Make native_shared_libs configurable" into main am: 5fdb54d439
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233522

Change-Id: Id9875a3ff68886f5296f72ebdaa9c912a3b2390d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 23:05:49 +00:00
Cole Faust
5fdb54d439 Merge "Make native_shared_libs configurable" into main 2024-08-20 23:03:31 +00:00
Treehugger Robot
c59a128390 Merge "Restrict R8 -libraryjars refs for stable targets" into main am: 0fd3de6151
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233562

Change-Id: I719d8ec110b692833aed69550f24eaa7159de6f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 22:37:26 +00:00
Treehugger Robot
0fd3de6151 Merge "Restrict R8 -libraryjars refs for stable targets" into main 2024-08-20 22:31:28 +00:00
Yu Liu
0dea28eafa Merge "Use namespace path instead of id in phonies." into main am: 1c794c66c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3233249

Change-Id: If463afcb4481c662d61e6f2d8ab153e154b1c875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 22:07:38 +00:00
Yu Liu
1c794c66c7 Merge "Use namespace path instead of id in phonies." into main 2024-08-20 22:02:07 +00:00
Yu Liu
ddc2e1ac09 Remove build target related fields from ModuleBase.
Bug: 358425833
Test: CI
Change-Id: I2af6d0d2fd3be70594860a0e6d86179d5850eb07
2024-08-20 21:31:22 +00:00
Jared Duke
2246844554 Restrict R8 -libraryjars refs for stable targets
The current R8 dex pipeline gathers transitive header jars to avoid
issues with missing class definitions. While this is benign for
platform targets not using a stable SDK, it can introduce issues
for stable targets (e.g., duplicate class defs for mainline framework
modules).

Bypass this transitive jar referencing for such targets that should
reference explicit, stable, stub API libraries. A follow-up change
will resolve specific issues with mainline system server targets.

Bug: 360905238
Test: m
Change-Id: I11a136d33ca9dd0dfff436c7045bf1807d17b1e7
2024-08-20 20:45:35 +00:00
Cole Faust
ac92f3e3f4 Make native_shared_libs configurable
So that you can use selects with it.

This cl also creates a ResolvedApexNativeDependencies to represent
a merged and evaluated set of ApexNativeDependencies. Previously other
properties added their own "resolved" versions individually, but I
think it's better design for the property structs to remain unchanged,
so I created a new non-property struct to contain the resolved values.
Immutable property structs is one of the things we want to add for
performance (removing property struct copies).

Bug: 342006386
Test: Presubmits
Change-Id: Ibf222c4a7c01df7d5ccc5a85b2e3c9b3f9243b9a
2024-08-20 13:26:52 -07:00
Cole Faust
0821a8cf57 Merge "Only add deps on java_binary's jni_libs on host" into main am: b4cc88efef
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3230584

Change-Id: I5a6588ee4724f6b128e0e2ed5092b3f52c57996c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 20:13:16 +00:00
Cole Faust
b4cc88efef Merge "Only add deps on java_binary's jni_libs on host" into main 2024-08-20 20:03:54 +00:00
Treehugger Robot
3c5ac75112 Merge "Encode directly into file" into main am: 800bde1021
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3211628

Change-Id: I4fecc12fec9384227c38a1b246acff06c54f4224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 19:38:40 +00:00
Treehugger Robot
800bde1021 Merge "Encode directly into file" into main 2024-08-20 19:36:46 +00:00
Yu Liu
460c0fa8b4 Use namespace path instead of id in phonies.
Otherwise the phones' names depend on the sorting order of all the
namespaces, which add unnecessary dependencies.

Bug: 358425833
Test: CI
Change-Id: Ic88a329ff320e508ece8e3b20c7497a28a619276
2024-08-20 19:34:49 +00:00
Elliott Hughes
5f9ff58115 Merge "Use -fno-omit-frame-pointer for host windows." into main am: 8f977d2982
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3232540

Change-Id: I0ed83e7f23251f153e1a231335daead219c155b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 19:28:39 +00:00
Elliott Hughes
d9d6f173b5 Merge "Use -fno-omit-frame-pointer for host darwin." into main am: ed524b6313
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3232620

Change-Id: I8996aacd23876ba92dd820026628705a29c8dca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 19:27:56 +00:00
Elliott Hughes
8f977d2982 Merge "Use -fno-omit-frame-pointer for host windows." into main 2024-08-20 19:20:21 +00:00
Elliott Hughes
ed524b6313 Merge "Use -fno-omit-frame-pointer for host darwin." into main 2024-08-20 19:20:02 +00:00
Cole Faust
3dac486013 Only add deps on java_binary's jni_libs on host
The jni_libs property of java_binary is documented to only install
the jni libraries on host. However, it was adding installable
deptag deps on those libraries, even if they were for device. This
caused soong to emit installation rules for the jni libraries, causing
them to be installed to the staging directory, but not emitting
proper information to make, so they wouldn't be included on the built
partitions.

Only install them if the module is built for host, so that they don't
erroneously appear in the staging directory.

Bug: 344695913
Test: Presubmits
Change-Id: Ic40b4fc6d7dbd51c03b08e28037be5428db49c33
2024-08-20 11:44:04 -07:00
Yu Liu
b5ae3f66a2 Merge "Add phonies as provider instead of updaing a global map." into main am: ee5b92fd6c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3229623

Change-Id: I3a075db80ad7c45067b080a2df8c50fc56b40b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 16:02:36 +00:00
Yu Liu
ee5b92fd6c Merge "Add phonies as provider instead of updaing a global map." into main 2024-08-20 15:56:33 +00:00
Elliott Hughes
7ae6c16f51 Use -fno-omit-frame-pointer for host windows.
Helps with debugging/profiling.

Bug: http://b/245707217
Change-Id: I6c163c67a04ab53a0b8a00edb233e6d60404f0a4
2024-08-20 15:09:39 +00:00
Elliott Hughes
67612c37f1 Use -fno-omit-frame-pointer for host darwin.
Helps with debugging/profiling.

Bug: http://b/245707217
Change-Id: Ifbe2f6d05059d4ffee5c33ddec743188164100ef
2024-08-20 15:07:30 +00:00
Elliott Hughes
0b5dce6dae Use -fno-omit-frame-pointer for host linux.
Helps with debugging/profiling.

Bug: http://b/245707217
Change-Id: I6b2d4f73edbdbcdc36b3bf531341dd2dfb51a87c
2024-08-20 15:06:00 +00:00
Cole Faust
83fcbf8350 Merge "Add $(build_number_file) support to genrules" into main am: cda9ce15ff
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3225783

Change-Id: I3e1a5224278a962a9eb6b9fb7f186e63d9d4f668
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 05:05:33 +00:00
Cole Faust
cda9ce15ff Merge "Add $(build_number_file) support to genrules" into main 2024-08-20 04:57:41 +00:00
Treehugger Robot
7af3d43dfb Merge "apex: apex_available with prefix" into main am: d4daa43150
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3223005

Change-Id: I080db49d61b8cc66a2ba2c71ae4be0eebb856f5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 02:51:20 +00:00
Treehugger Robot
d4daa43150 Merge "apex: apex_available with prefix" into main 2024-08-20 02:45:22 +00:00
Jooyung Han
9a419e28f5 apex: apex_available with prefix
We now support prefix form (com.foo.*) in apex_available list.

Bug: 360265761
Test: m --no-skip-soong-tests
Change-Id: I50ab884651dd6321950cfd4563b59ef3ed0f07fd
2024-08-20 10:50:04 +09:00
Treehugger Robot
bb6f99a0c0 Merge "Convert $(call soong_config_set_bool) to rbc" into main am: 2d2df8cbfd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3230983

Change-Id: I317c85bd29a65735d3f5c058654c94fc614def6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 01:37:26 +00:00
Treehugger Robot
2d2df8cbfd Merge "Convert $(call soong_config_set_bool) to rbc" into main 2024-08-20 01:32:07 +00:00
Qing Shen
bf74127850 Merge "Add a coverage suffix to avoid Ninja file regeneration." into main am: ff545caecd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3207217

Change-Id: Id62c886c0213fde81ab6a5834828c2a31c2d207e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-20 01:19:53 +00:00
Qing Shen
ff545caecd Merge "Add a coverage suffix to avoid Ninja file regeneration." into main 2024-08-20 01:16:53 +00:00
Cole Faust
5914aae79d Convert $(call soong_config_set_bool) to rbc
Bug: 342006386
Test: go test
Change-Id: I4729f25209d1d548b7b75c4d5bf2744ae4dcc31d
2024-08-19 17:34:46 -07:00
Cole Faust
78f3c3a3ad Add $(build_number_file) support to genrules
Genrules that set uses_order_only_build_number_file: true will now
have the ability to reference a $(build_number_file) label that
will point to the build number file. It will also caused the build
number file to be added as an order-only dependency, which will make
it show up in the genrule sandbox.

This is needed for converting make code that references the build
number to soong, and for sandboxing the remaining unsandboxed genrules
that reference the build number.

Bug: 341873065
Test: m nothing --no-skip-soong-tests
Change-Id: I9092cbb0eb39c5449a79f0ee40a4202262cef206
2024-08-19 16:06:34 -07:00
Cole Faust
ba4d002aaf Merge "Make the WholeStatic/Static/Shared libs properties configurable" into main am: 5b1a39a92a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3229386

Change-Id: Ifc8f019a075c397e513fa702e5302613fa2687d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-19 22:51:15 +00:00
Cole Faust
5b1a39a92a Merge "Make the WholeStatic/Static/Shared libs properties configurable" into main 2024-08-19 22:48:16 +00:00