Xin Li
771bfaa8ec
[automerger skipped] Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future am: 037736c1d0
-s ours
...
am skip reason: Merged-In I64ddf6215ddfe33e180a54bf8a98092da8286808 with SHA-1 3d530c24d7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27908490
Change-Id: I888aa8b72eb3303024560d384f9ae25ee539641c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 19:57:33 +00:00
Xin Li
f314e3db46
[automerger skipped] Merge 24Q3 (ab/11976889) to aosp-main-future am: 3956a39b9b
-s ours
...
am skip reason: Merged-In I64ddf6215ddfe33e180a54bf8a98092da8286808 with SHA-1 3d530c24d7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/27908490
Change-Id: Id9fff1ec8412e9c6e205b1ca88dc0b46822667a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 19:56:56 +00:00
Treehugger Robot
fe6ccc2747
Merge "Add --tag argument to soongdbg" into main am: e28ee78351
am: 38445bf59f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141538
Change-Id: I73d0ef92acffb0efd9221db6f374d11b4fba7465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 19:46:19 +00:00
Xin Li
037736c1d0
Merge "Merge 24Q3 (ab/11976889) to aosp-main-future" into aosp-main-future
2024-06-20 19:38:53 +00:00
Treehugger Robot
38445bf59f
Merge "Add --tag argument to soongdbg" into main am: e28ee78351
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141538
Change-Id: I41490a2a89be09a69315df30711e367da55ddffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 19:25:07 +00:00
Treehugger Robot
e28ee78351
Merge "Add --tag argument to soongdbg" into main
2024-06-20 19:10:34 +00:00
Zi Wang
b7b83edec5
Merge "Use OutputFilesProvider on python_binary_host" into main am: 66c8090a3a
am: c067119409
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137735
Change-Id: Ic6961cfcbf8c653077cbc49fffd182fa1f7360a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 18:55:36 +00:00
Zi Wang
a1fef530dc
Merge "ExportableModule no longer implements OutputFileProducer" into main am: c48c1b5721
am: 8d0c115e35
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131731
Change-Id: I3990a2152cf51dc7b50aec6b9190789f4d4fab32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 18:55:24 +00:00
Zi Wang
c067119409
Merge "Use OutputFilesProvider on python_binary_host" into main am: 66c8090a3a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137735
Change-Id: I0b3fe4ce88de4a6c35259e85f1ff3b0ae2981ffa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 18:30:06 +00:00
Zi Wang
8d0c115e35
Merge "ExportableModule no longer implements OutputFileProducer" into main am: c48c1b5721
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131731
Change-Id: I7ba01f53d53b030db18f1608b30412df8ac874aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 18:29:52 +00:00
Zi Wang
66c8090a3a
Merge "Use OutputFilesProvider on python_binary_host" into main
2024-06-20 18:20:17 +00:00
Treehugger Robot
cb9d63cb25
Merge "Remove an out of date comment." into main am: 50d40cbc8c
am: 443a976a94
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141137
Change-Id: I3ddee09ef76e2875b0d7c7ebfcda874e1cf667bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 18:17:25 +00:00
Spandan Das
6ab2cd1bd5
Add unit test for sdk library permission xml file am: 3ee19697d5
am: bb6c60e7c4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137580
Change-Id: I97245143372185ed61c85aa60b93237d63f7636d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 18:17:11 +00:00
mrziwang
069da0c1e3
Use OutputFilesProvider on global_compat_config am: 9e7127ff3b
am: bc6361607f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137576
Change-Id: Ie07160f7a260f66169bc25bc7f7cdeac2392a88c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 18:16:43 +00:00
Zi Wang
c48c1b5721
Merge "ExportableModule no longer implements OutputFileProducer" into main
2024-06-20 18:09:24 +00:00
Joe Onorato
250c551a26
Add --tag argument to soongdbg
...
The --tag argument will filter the dependencies to just the given deptags
as it walks the graph.
Test: soongdbg deps --tag android/soong/android.defaultsDependencyTag framework-minus-apex
Test: soongdbg between --tag android/soong/android.defaultsDependencyTag framework-minus-apex framework-minus-apex-defaults
Change-Id: I566477ffcd9d5e4b3e57155f65e84999e4908c79
2024-06-20 11:05:17 -07:00
Treehugger Robot
443a976a94
Merge "Remove an out of date comment." into main am: 50d40cbc8c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141137
Change-Id: Iec697d450e82ba17806a3ffd61344f2fdab504fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 17:56:35 +00:00
Spandan Das
bb6c60e7c4
Add unit test for sdk library permission xml file am: 3ee19697d5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137580
Change-Id: I85a1a43b04360a9e170dabf64dccbb95a3562a68
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 17:56:22 +00:00
mrziwang
bc6361607f
Use OutputFilesProvider on global_compat_config am: 9e7127ff3b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137576
Change-Id: Icc49328fa96fbc0b5673bfa05d15ab20513804fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 17:56:15 +00:00
Treehugger Robot
50d40cbc8c
Merge "Remove an out of date comment." into main
2024-06-20 17:47:15 +00:00
Spandan Das
3ee19697d5
Add unit test for sdk library permission xml file
...
Followup to the fix in https://r.android.com/3137737 . This adds a unit
test to check the permission xml file contents of sdk library. This file
contains the on-device location of the sdk implementation library.
override/overridden apexes are installed in the same location, so the
on-device sdklibrary path should remain consistent in the xml files of
the override and overridden apexes.
Test: go test ./apex
Bug: 346486531
Change-Id: I61adbf94bdfce8aa89de89cc90b6f564f2f7417f
2024-06-20 17:36:54 +00:00
Zi Wang
6fe215c87c
Merge "Use OutputFilesProvider on cc_cmake_snapshot" into main am: 26faf1b321
am: 674d1872e4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3133295
Change-Id: I9c7ea9774a8d0d0ed57acb74f513cb0b91214a49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 16:46:54 +00:00
Zi Wang
4f9952bf5a
Merge "Use OutputFilesProvider on sdk" into main am: 9b3fba9b0b
am: 8ab5d0619a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3138075
Change-Id: Iaca0ec42fef8bc334bae694351255182b8d84104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 16:46:12 +00:00
Elliott Hughes
b3b05ba84d
Remove an out of date comment.
...
libandroid_support no longer exists.
Change-Id: I6e66f3e0fd5c58bff3c91563a33e0afc8614488c
2024-06-20 16:34:19 +00:00
Zi Wang
674d1872e4
Merge "Use OutputFilesProvider on cc_cmake_snapshot" into main am: 26faf1b321
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3133295
Change-Id: Ib129339698ecaa6d0c1c7b6013965e4c3bf42b73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 16:31:34 +00:00
Zi Wang
8ab5d0619a
Merge "Use OutputFilesProvider on sdk" into main am: 9b3fba9b0b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3138075
Change-Id: I25c34bdb7892195da012215489eea504a172febf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 16:30:37 +00:00
mrziwang
9e7127ff3b
Use OutputFilesProvider on global_compat_config
...
In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.
Test: CI
Bug: 339477385
Change-Id: I6deb4a005876848f28a5b823a712d9eea33a44e6
2024-06-20 16:20:06 +00:00
mrziwang
e7ec89e0a9
ExportableModule no longer implements OutputFileProducer
...
multitree.ExportableModule no longer implements
android.OutputFileProducer
In the context of incremental soong, the output files
inter-module-communication will be through OutputFilesProvider.
The OutputFileProducer interface will be deprecated.
ApiSurface and apexBundle are included in this change.
Test: CI
Bug: 339477385
Change-Id: I9247bb2dfed270a879f8bc96c6aa06803fde0150
2024-06-20 16:19:48 +00:00
Zi Wang
26faf1b321
Merge "Use OutputFilesProvider on cc_cmake_snapshot" into main
2024-06-20 16:18:16 +00:00
Zi Wang
9b3fba9b0b
Merge "Use OutputFilesProvider on sdk" into main
2024-06-20 16:17:49 +00:00
Victor Chang
7a0795e1c3
[automerger skipped] Merge "Allow java, java. and jdk.* package_allowed_list.txt." into main am: abf841134f
-s ours am: e3c4e08dc8
-s ours
...
am skip reason: Merged-In Icb208bb235f9c6ac97492c54c32a3174982756ae with SHA-1 4025390468
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131678
Change-Id: I6b82d3aa30bc60da080d2576f66b9c78811157b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 10:16:09 +00:00
Jiakai Zhang
cb158cedf1
[automerger skipped] Allow java, java. and jdk.* package_allowed_list.txt. am: a66c2c5b9b
-s ours am: 0421f5fb53
-s ours
...
am skip reason: Merged-In Icb208bb235f9c6ac97492c54c32a3174982756ae with SHA-1 4025390468
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131678
Change-Id: I90e26dc6fccbc58cf2d7bd1d30cb7df46fb75edd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 10:16:04 +00:00
Victor Chang
e3c4e08dc8
[automerger skipped] Merge "Allow java, java. and jdk.* package_allowed_list.txt." into main am: abf841134f
-s ours
...
am skip reason: Merged-In Icb208bb235f9c6ac97492c54c32a3174982756ae with SHA-1 4025390468
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131678
Change-Id: Ie775331ce1a23052b606e2b57455c32bdb6619ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 10:01:16 +00:00
Jiakai Zhang
0421f5fb53
[automerger skipped] Allow java, java. and jdk.* package_allowed_list.txt. am: a66c2c5b9b
-s ours
...
am skip reason: Merged-In Icb208bb235f9c6ac97492c54c32a3174982756ae with SHA-1 4025390468
is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3131678
Change-Id: I9f6baa579350fab0945868e6ff21cd5b99bcd736
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 10:01:11 +00:00
Victor Chang
abf841134f
Merge "Allow java, java. and jdk.* package_allowed_list.txt." into main
2024-06-20 09:32:44 +00:00
Victor Chang
bfb96cd3f4
Merge "Allow jdk.internal.event / .vm in the boot image" into main am: 9fc907642b
am: 654a71d779
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3135834
Change-Id: I84c8207b15e487a5a8885eaecbdd15f08c16fa6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 09:23:06 +00:00
Victor Chang
654a71d779
Merge "Allow jdk.internal.event / .vm in the boot image" into main am: 9fc907642b
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3135834
Change-Id: I8b5ab810dc41a52dbc8ea30e1a5376b9734503fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-20 09:05:10 +00:00
Victor Chang
9fc907642b
Merge "Allow jdk.internal.event / .vm in the boot image" into main
2024-06-20 08:48:26 +00:00
Pechetty Sravani
24ca3b7cd0
Merge "Revert "Enable -Wfortify-source"" into main am: f80ffa8b86
am: 87d3914c9d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3138998
Change-Id: Ic1404174f0452ef9b6d7d90cfd568c419352f4fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-19 13:46:20 +00:00
Pechetty Sravani
87d3914c9d
Merge "Revert "Enable -Wfortify-source"" into main am: f80ffa8b86
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3138998
Change-Id: I3644222aee0457c370123da726fd889dc604fd7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-19 13:29:13 +00:00
Pechetty Sravani
f80ffa8b86
Merge "Revert "Enable -Wfortify-source"" into main
2024-06-19 13:15:28 +00:00
Pechetty Sravani
55748021b0
Revert "Enable -Wfortify-source"
...
This reverts commit 25e9e900f1
.
Reason for revert: Droidmonitor triggered revert due to build breakage in b/348142863. Will be verifying through ABTD before submission.
Change-Id: Ia18f83e9261e395cf5f76669523bd6f4a5e9ba49
2024-06-19 11:47:27 +00:00
Maciej Żenczykowski
751c527f38
Merge "Enable -Wfortify-source" into main am: d957a9bd70
am: 9c2feaeb69
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3138074
Change-Id: I26a68a3cbb9b725667b6afaa208ce590200318fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-19 10:52:03 +00:00
Maciej Żenczykowski
9c2feaeb69
Merge "Enable -Wfortify-source" into main am: d957a9bd70
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3138074
Change-Id: I22751725e89b8a62ea51827d8c49806242ddb2f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-19 10:35:43 +00:00
Paul Duffin
4ae37802ea
Merge "Support passing multiple --migrate-nullness option for java_api_library" into main am: 94811f3031
am: bda26557b7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137213
Change-Id: I9eede13adcf6aee2b62fb95d3893b83195cc5557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-19 10:29:00 +00:00
Maciej Żenczykowski
d957a9bd70
Merge "Enable -Wfortify-source" into main
2024-06-19 10:09:21 +00:00
Paul Duffin
bda26557b7
Merge "Support passing multiple --migrate-nullness option for java_api_library" into main am: 94811f3031
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137213
Change-Id: I8421cbfd4816d9f4442cf43e0f88e1a07b36e928
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-19 10:05:42 +00:00
Paul Duffin
94811f3031
Merge "Support passing multiple --migrate-nullness option for java_api_library" into main
2024-06-19 09:48:09 +00:00
Treehugger Robot
3cd54b6846
Merge "Use BaseApexName to generate permission file for sdk library" into main am: c0cbb491d5
am: eab0a4e579
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137737
Change-Id: I3fcab47c1cfbf10f21cb8a9008e0f42cad792dd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-19 05:14:58 +00:00
Treehugger Robot
eab0a4e579
Merge "Use BaseApexName to generate permission file for sdk library" into main am: c0cbb491d5
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3137737
Change-Id: Ia1fb053a18dfe27100c0c5a8d7ab084822ff0603
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-06-19 04:50:37 +00:00