Commit Graph

78501 Commits

Author SHA1 Message Date
Mythri Alle
41c77c8fe6 Merge "Don't minimize debug information if module explicitly asks for it" into main am: 4efd3365cc am: cfb87f5968 am: 53df5aa247
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2803327

Change-Id: I70f50f254714bf0e5e72ca97ddae069c43fe26ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 09:37:24 +00:00
Mythri Alle
53df5aa247 Merge "Don't minimize debug information if module explicitly asks for it" into main am: 4efd3365cc am: cfb87f5968
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2803327

Change-Id: I48571eb1a7e9525b35615058d573f4d4847edaa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 09:05:31 +00:00
Mythri Alle
cfb87f5968 Merge "Don't minimize debug information if module explicitly asks for it" into main am: 4efd3365cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2803327

Change-Id: I6095259a3e71f8e9b38b6abde2a77d4c02322208
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 08:42:43 +00:00
Mythri Alle
4efd3365cc Merge "Don't minimize debug information if module explicitly asks for it" into main 2023-10-26 08:18:02 +00:00
Fyodor Kyslov
afc605a27e Merge "Allowlist libcodec2_soft_av1dec_dav1d" into main am: ec2739fc22 am: 68554f5efc am: 9d73f9affb
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802353

Change-Id: I50971214bf90ae1c00062321b8ba8a7229ac0fe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:18:59 +00:00
Fyodor Kyslov
ca86bbd94a Merge "Allowlist libcodec2_soft_av1dec_dav1d" into main am: ec2739fc22 am: b573b75db8 am: de85ed5e43
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802353

Change-Id: Iec7acffc83321162dc73861148e82cafe5597abb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:18:48 +00:00
Treehugger Robot
ce47515051 Merge "Temporarily disable swcodec in mixed bulid" into main am: 54028dc5ae am: 8646be6de8 am: 164c97a711
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802594

Change-Id: I1d828dc831552c7496d04a50d3b6ee56f0110e59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:17:49 +00:00
Treehugger Robot
05a0aab64b Merge "Temporarily disable swcodec in mixed bulid" into main am: 54028dc5ae am: 3f543604f4 am: 89ffe9e99c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802594

Change-Id: I0f67e5b075ced96ecfcc82c90a47f5fead1643da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:16:41 +00:00
Fyodor Kyslov
9d73f9affb Merge "Allowlist libcodec2_soft_av1dec_dav1d" into main am: ec2739fc22 am: 68554f5efc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802353

Change-Id: Idfb4ba48ee2e148fb90cc62fbde22703db14c603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 19:47:34 +00:00
Fyodor Kyslov
de85ed5e43 Merge "Allowlist libcodec2_soft_av1dec_dav1d" into main am: ec2739fc22 am: b573b75db8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802353

Change-Id: I09f2adf1ce4fd0fb566b3071248cde549de43bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 19:47:24 +00:00
Treehugger Robot
164c97a711 Merge "Temporarily disable swcodec in mixed bulid" into main am: 54028dc5ae am: 8646be6de8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802594

Change-Id: I778f1963360cdc47d776635385d7ef145ffa61ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 19:47:14 +00:00
Treehugger Robot
89ffe9e99c Merge "Temporarily disable swcodec in mixed bulid" into main am: 54028dc5ae am: 3f543604f4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802594

Change-Id: If2393a9c94a78e798f8ff25f230c8668c67d457f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 19:47:01 +00:00
Fyodor Kyslov
68554f5efc Merge "Allowlist libcodec2_soft_av1dec_dav1d" into main am: ec2739fc22
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802353

Change-Id: Ie8d2f16c6109443c9939d59d3793863b81d919d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 19:27:18 +00:00
Fyodor Kyslov
b573b75db8 Merge "Allowlist libcodec2_soft_av1dec_dav1d" into main am: ec2739fc22
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802353

Change-Id: I87eadc30af595061d9c93003b4b2a280a94960db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 19:27:15 +00:00
Treehugger Robot
8646be6de8 Merge "Temporarily disable swcodec in mixed bulid" into main am: 54028dc5ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802594

Change-Id: Iaad0594d50b1931e23988e0a292523b9c76c0ff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 19:26:17 +00:00
Treehugger Robot
3f543604f4 Merge "Temporarily disable swcodec in mixed bulid" into main am: 54028dc5ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802594

Change-Id: I62f84c6d6e2306e0dcf9183d460a84721f5356d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 19:24:32 +00:00
Fyodor Kyslov
ec2739fc22 Merge "Allowlist libcodec2_soft_av1dec_dav1d" into main 2023-10-25 19:22:15 +00:00
Treehugger Robot
54028dc5ae Merge "Temporarily disable swcodec in mixed bulid" into main 2023-10-25 18:55:36 +00:00
Mythri Alle
4b9f618a76 Don't minimize debug information if module explicitly asks for it
In some configurations (for ex: go, auto) we minimize debug information
to reduce disk and memory usage. However some tests need the debug
information to work as expected. If a test explicitly requests for debug
information by passing "-g" to javac flags don't add "-g:source,lines"
to minimize debug information. Javac gives priority to -g:source,lines
and doesn't respect the order. So check if there is a -g flag before
adding flags to minimize debug information.

Test: atest CtsJvmtiRunTest1912HostTestCases android.jvmti.cts.JvmtiHostTest1912#testJvmti
Change-Id: I45e0f5fa9e79c16c2ff6e9413941a9a637753653
2023-10-25 16:50:41 +00:00
Vinh Tran
1c11c61897 Temporarily disable swcodec in mixed bulid
When aconfig (rust_binary) becomes a transitive dependency of swcodec, mixed build swcodec breaks because the cargo_build_script rust rule declares a directory which is not handled by mixed build yet. See b/307389608 for more context.

A follow-up CL will fix the issue and allow enabling swcodec in mixed build again.

Bug: 307389608
Test: Presubmit
Change-Id: I7ba7b5cd06b231f4867870fe8d0bd53299528fe3
2023-10-25 10:52:41 -04:00
Colin Cross
8acfa1a890 Merge "Disable Soong tests by default on Linux" into main am: c2d3ffcae3 am: d4fcac7493 am: 717e200e70
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802174

Change-Id: Iaf5f4dea045591499feebc808fc4ce351bafde87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 23:32:14 +00:00
Colin Cross
7f4242f00e Merge "Disable Soong tests by default on Linux" into main am: c2d3ffcae3 am: 0d7e5708bf am: f3b40d992e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802174

Change-Id: Ic90f1f777fc6c0b7e020a97c2f7b26b955f184e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 23:31:52 +00:00
Colin Cross
717e200e70 Merge "Disable Soong tests by default on Linux" into main am: c2d3ffcae3 am: d4fcac7493
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802174

Change-Id: I0ff23d8ac48380046306ec2818f8dc9f82cc0e1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 23:02:09 +00:00
Colin Cross
f3b40d992e Merge "Disable Soong tests by default on Linux" into main am: c2d3ffcae3 am: 0d7e5708bf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802174

Change-Id: I7bdde824220fbf53401c9f246b5a2c25af929672
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 23:00:10 +00:00
Colin Cross
d4fcac7493 Merge "Disable Soong tests by default on Linux" into main am: c2d3ffcae3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802174

Change-Id: Ib9ca2c4484a63ece7155eb146a40b81857265fd5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 22:40:45 +00:00
Colin Cross
0d7e5708bf Merge "Disable Soong tests by default on Linux" into main am: c2d3ffcae3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2802174

Change-Id: I238a969f4489efb714515a7775211d4cec523363
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 22:38:52 +00:00
Colin Cross
c2d3ffcae3 Merge "Disable Soong tests by default on Linux" into main 2023-10-24 22:21:17 +00:00
Treehugger Robot
0ad7c65b09 Merge "Simplify commandString" into main am: 8aca5be771 am: 63f68771c7 am: 857219672f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2801933

Change-Id: I457126055c7373dbb98d36c49b1ab0deb7a5fefa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 21:24:43 +00:00
Treehugger Robot
bd5277f902 Merge "Simplify commandString" into main am: 8aca5be771 am: ee76ae786e am: 32f9ae082e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2801933

Change-Id: Id53b3b173ecc3507f5b0dd009355686370215c5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 21:24:29 +00:00
Treehugger Robot
857219672f Merge "Simplify commandString" into main am: 8aca5be771 am: 63f68771c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2801933

Change-Id: I7f2a39d5dc7d9e9e8a206d731b88887c279fa043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 20:55:08 +00:00
Treehugger Robot
32f9ae082e Merge "Simplify commandString" into main am: 8aca5be771 am: ee76ae786e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2801933

Change-Id: I9f3d8f2cd55a4cbbf7bd2e77ffe95278ecb9c277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 20:53:50 +00:00
Treehugger Robot
63f68771c7 Merge "Simplify commandString" into main am: 8aca5be771
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2801933

Change-Id: I644183caedfbe7ec4d765c712483d0166b8d3ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 20:34:07 +00:00
Treehugger Robot
ee76ae786e Merge "Simplify commandString" into main am: 8aca5be771
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2801933

Change-Id: I6eb1292e2e8fcd6f3a125ab88b74e5beaf0c2513
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 20:32:16 +00:00
Treehugger Robot
8aca5be771 Merge "Simplify commandString" into main 2023-10-24 20:07:45 +00:00
Harish Mahendrakar
5c98a68ed6 Allowlist libcodec2_soft_av1dec_dav1d
Bug: 289716589
Test: builds

Change-Id: Iee45b8fff6aea3fcf31fc1ea718911f54d42362c
2023-10-24 18:31:09 +00:00
Colin Cross
106d6ef459 Disable Soong tests by default on Linux
Disable running the Soong tests when building on Linux.  The tests
are still enabled when running on Darwin to ensure we have test on
Darwin in CI.  Checkbuilds still depend on the tests, which will
provide test coverage in CI on Linux.

Bug: 269296618
Test: aninja -t path checkbuild out/host/linux-x86/bin/go/soong-java/test/test.passed
Test: m nothing
Change-Id: Ib8359ff6d2a92eeb2ac9a9e95ecd65abc4e40061
2023-10-24 11:00:59 -07:00
Cole Faust
b378c18ddf Simplify commandString
Use the same logic for both go and non-go actions. This also has a
slight performance improvement for go actions by allocating the slice
in advance instead of using append()

Test: Presubmits
Change-Id: I92b60c547d8470816a67ac1ef6e334fd5f547701
2023-10-24 10:24:05 -07:00
Anton Hansson
5657d1b0c7 [automerger skipped] Merge "Created empty framework-location non-updatable module" into main am: 05eabd9c4d am: 4da84d851a -s ours am: bd74709e33 -s ours
am skip reason: Merged-In Iebc6d016b8313759ac1f6f3ab6f4834f5ad7b93e with SHA-1 387a658e2d is already in history

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

Change-Id: I38629e6b075442aaa2c1b0522c3b4f72870be4d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 13:48:02 +00:00
Sebastian Pickl
281235e8a7 Merge "Revert "Default from-text stub generation in build"" into main am: 479ab86e6b am: 941b573536 am: a0a47c10e6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799381

Change-Id: I58c7d5e36669e5ba95e72af65c3a30e8b7b8d919
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 13:47:34 +00:00
Anton Hansson
bfe07a5f9f [automerger skipped] Merge "Created empty framework-location non-updatable module" into main am: 05eabd9c4d am: 7c041f77c1 am: 5d73b68c9d -s ours
am skip reason: Merged-In Iebc6d016b8313759ac1f6f3ab6f4834f5ad7b93e with SHA-1 8bf29fd473 is already in history

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

Change-Id: I206e79a2fd518531212a251a8092e131082ce0dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 13:46:59 +00:00
Sebastian Pickl
92eecd876b Merge "Revert "Default from-text stub generation in build"" into main am: 479ab86e6b am: bf9a4dc70e am: 7c06e4896e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799381

Change-Id: I9ece15dffe3b4feacb4879d60bf649e10ab86dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 13:46:22 +00:00
Anton Hansson
bd74709e33 [automerger skipped] Merge "Created empty framework-location non-updatable module" into main am: 05eabd9c4d am: 4da84d851a -s ours
am skip reason: Merged-In Iebc6d016b8313759ac1f6f3ab6f4834f5ad7b93e with SHA-1 387a658e2d is already in history

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

Change-Id: If61aa14ade2babaf4ac7a241c1ae8435c7b5fab5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 13:19:15 +00:00
Sebastian Pickl
a0a47c10e6 Merge "Revert "Default from-text stub generation in build"" into main am: 479ab86e6b am: 941b573536
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799381

Change-Id: I16c63b9deeb3794d59e4078d40e5efe33030ea47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 13:18:35 +00:00
Anton Hansson
5d73b68c9d Merge "Created empty framework-location non-updatable module" into main am: 05eabd9c4d am: 7c041f77c1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727716

Change-Id: I59502d56aca16627258861324701d57e3e803d83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 13:17:45 +00:00
Sebastian Pickl
7c06e4896e Merge "Revert "Default from-text stub generation in build"" into main am: 479ab86e6b am: bf9a4dc70e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799381

Change-Id: I7f658bf3975dda80a928e2b8945bdc8bf6ae8d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 13:17:10 +00:00
Anton Hansson
7c041f77c1 Merge "Created empty framework-location non-updatable module" into main am: 05eabd9c4d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727716

Change-Id: I0e10ed7d9d51d3968c517452631c528825ba10a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 12:59:38 +00:00
Anton Hansson
4da84d851a Merge "Created empty framework-location non-updatable module" into main am: 05eabd9c4d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2727716

Change-Id: Ia2e05bafe3b12f3366c96e3eef5544ea5a4e4051
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 12:59:17 +00:00
Sebastian Pickl
bf9a4dc70e Merge "Revert "Default from-text stub generation in build"" into main am: 479ab86e6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799381

Change-Id: I0314dbba48341002f65c4caa2e1a5f39bb9e8430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 12:58:04 +00:00
Sebastian Pickl
941b573536 Merge "Revert "Default from-text stub generation in build"" into main am: 479ab86e6b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2799381

Change-Id: I68c5a6646cf73cc935d018342ed1c9e4764f3c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 12:57:12 +00:00
Sebastian Pickl
2e196473d0 Revert "Default from-text stub generation in build"
This reverts commit 182b56b870.

Reason for revert: breaking boot tests b/307495247, b/307411752

Bug:307495247
(cherry picked from https://android-review.googlesource.com/q/commit:1c4188c9da7b55cdae967e2d2a0a3c9a51c0ad9f)
Merged-In: Iea05703b767d2699ca3cf69377eb44b1d21697ad
Change-Id: Iea05703b767d2699ca3cf69377eb44b1d21697ad
2023-10-24 12:46:36 +00:00