Commit Graph

74177 Commits

Author SHA1 Message Date
Treehugger Robot
750d2e9c56 Merge "Handle include statements with trailing whitespace" into main am: a32f556ad3 am: 4a699d0d6d am: 24a715658d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776869

Change-Id: Ia3e1486817acbf979062ca472c15ad7149960f80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:21:10 +00:00
Treehugger Robot
24a715658d Merge "Handle include statements with trailing whitespace" into main am: a32f556ad3 am: 4a699d0d6d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776869

Change-Id: I46043030285e2e8f17649174efec452e39d1130f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 23:46:32 +00:00
Treehugger Robot
4a699d0d6d Merge "Handle include statements with trailing whitespace" into main am: a32f556ad3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776869

Change-Id: I814d52389a603d03a6747b32f6f4745ef1bb0005
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 23:11:29 +00:00
Treehugger Robot
a32f556ad3 Merge "Handle include statements with trailing whitespace" into main 2023-10-06 22:25:04 +00:00
Treehugger Robot
6ec3b31d6c Merge "Allowlist AndroidFrameworkLintChecker" into main am: 6bc88ae14d am: 2579fbad62 am: 8cd59aee93
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745835

Change-Id: Idf4060192f51b2bd9e7e688109b1edb98902f8ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:39:54 +00:00
Treehugger Robot
4de5c1d0be Merge "Update Headers_only to a bool pointer" into main am: 9ea1d061b7 am: 077566faf4 am: 459c689b9d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775982

Change-Id: I8587956b4a5b6e5878b2e80331468a132dcbb51d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:38:39 +00:00
Alyssa Ketpreechasawat
c5e1ac2ea6 Merge "Revert "Revert "Disable hiddenapi check for building from prebuilts.""" into main am: 2711ce2e1f am: fc3ab39cae am: 7209384e9a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775656

Change-Id: I644c09f737dab073b303ded2aac8e78c8eebde59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:37:57 +00:00
Treehugger Robot
8cd59aee93 Merge "Allowlist AndroidFrameworkLintChecker" into main am: 6bc88ae14d am: 2579fbad62
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745835

Change-Id: I2d445fb9fbdabebfa3571133d28b9f6d59117448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:37:52 +00:00
Dan Albert
de74892eae Merge "Fix error message to still be an error." into main am: dbd4a25cf7 am: 9f98477e8f am: 8dcd17afb8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775983

Change-Id: Iedf7d312879214fc0b558bde670062605c51cbf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:37:33 +00:00
Treehugger Robot
459c689b9d Merge "Update Headers_only to a bool pointer" into main am: 9ea1d061b7 am: 077566faf4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775982

Change-Id: If3d23d2c67d81becc00332cac5cf022e451a158d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:37:07 +00:00
Vinh Tran
af3b2d6e00 Merge "Export device arm64 rust flags to Bazel" into main am: 001ec85bcc am: 59ffcbd8de am: b1182cefa4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773604

Change-Id: I33213c49c3f0b97f0ff51e0499a55da56ea6ca92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:21:26 +00:00
Mark Dacek
21e3f0fc73 Merge "Revert "Revert "Modify symlink_forest to rerun when soong_build has changed.""" into main am: e0b6329384 am: 5428ba4965 am: ab00c0109f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771971

Change-Id: I960e38a50d71af3a2969d0c2fea217c9778c4c9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:21:18 +00:00
Treehugger Robot
2579fbad62 Merge "Allowlist AndroidFrameworkLintChecker" into main am: 6bc88ae14d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745835

Change-Id: I6652471ae910af49e38d18c52038a1f98e6a550e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:19:00 +00:00
Treehugger Robot
077566faf4 Merge "Update Headers_only to a bool pointer" into main am: 9ea1d061b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775982

Change-Id: I01cd2d73f055028b09107a06661040c0fd7be845
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:18:47 +00:00
Treehugger Robot
6bc88ae14d Merge "Allowlist AndroidFrameworkLintChecker" into main 2023-10-06 20:17:25 +00:00
Treehugger Robot
9ea1d061b7 Merge "Update Headers_only to a bool pointer" into main 2023-10-06 19:59:17 +00:00
Alyssa Ketpreechasawat
7209384e9a Merge "Revert "Revert "Disable hiddenapi check for building from prebuilts.""" into main am: 2711ce2e1f am: fc3ab39cae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775656

Change-Id: I38e304b0e2e97a311c045fc27b7daaf3836385df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 19:30:42 +00:00
Dan Albert
8dcd17afb8 Merge "Fix error message to still be an error." into main am: dbd4a25cf7 am: 9f98477e8f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775983

Change-Id: Iface8d94d62456e59ca7530f44b0b5bcb696046f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 19:29:58 +00:00
Alyssa Ketpreechasawat
fc3ab39cae Merge "Revert "Revert "Disable hiddenapi check for building from prebuilts.""" into main am: 2711ce2e1f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775656

Change-Id: Ia8f61e5c775856f54107b273ed5d1b88a976afc5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 19:28:15 +00:00
Vinh Tran
b1182cefa4 Merge "Export device arm64 rust flags to Bazel" into main am: 001ec85bcc am: 59ffcbd8de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773604

Change-Id: I82422b0f5cd0284b0d205e4c605a01c9fdd16aaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 19:27:27 +00:00
Mark Dacek
ab00c0109f Merge "Revert "Revert "Modify symlink_forest to rerun when soong_build has changed.""" into main am: e0b6329384 am: 5428ba4965
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771971

Change-Id: I62205d2551cee69388225cead9ad59aa10378712
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 19:27:16 +00:00
Alyssa Ketpreechasawat
2711ce2e1f Merge "Revert "Revert "Disable hiddenapi check for building from prebuilts.""" into main 2023-10-06 19:17:40 +00:00
Dan Albert
9f98477e8f Merge "Fix error message to still be an error." into main am: dbd4a25cf7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775983

Change-Id: Ife1a7a03e8180f03b1ac6ce848def167171a349a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 19:09:34 +00:00
Cole Faust
b0b2457842 Handle include statements with trailing whitespace
Fixes: 303832950
Test: go test
Change-Id: I919556ee43a60f59dbd7c040025f01abb53da2a8
2023-10-06 11:57:29 -07:00
Dan Albert
dbd4a25cf7 Merge "Fix error message to still be an error." into main 2023-10-06 18:55:32 +00:00
Vinh Tran
59ffcbd8de Merge "Export device arm64 rust flags to Bazel" into main am: 001ec85bcc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773604

Change-Id: Ica62ebb44c14827485d72dd71308e18e3ca1078c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 18:53:08 +00:00
Mark Dacek
5428ba4965 Merge "Revert "Revert "Modify symlink_forest to rerun when soong_build has changed.""" into main am: e0b6329384
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771971

Change-Id: Ifb9b9bfdb867bfc61d424539d76cf161db26f792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 18:51:41 +00:00
Treehugger Robot
14b6e7a77f Merge "Remove unnecessary arch variant for patch module" into main am: aa46295842 am: 633fde4719 am: 21698a7c14
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775981

Change-Id: I776696c520978306b2509dbf0ea7cbe27c0adc77
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 18:14:20 +00:00
Vinh Tran
001ec85bcc Merge "Export device arm64 rust flags to Bazel" into main 2023-10-06 17:50:15 +00:00
Mark Dacek
e0b6329384 Merge "Revert "Revert "Modify symlink_forest to rerun when soong_build has changed.""" into main 2023-10-06 17:34:47 +00:00
Treehugger Robot
21698a7c14 Merge "Remove unnecessary arch variant for patch module" into main am: aa46295842 am: 633fde4719
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775981

Change-Id: Ie82f053a6e2d5e576ad1f5df2157c78c51117769
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 16:46:13 +00:00
Christopher Parsons
c3757c0c02 Merge "Dont write data attrs for cc lib rules" into main am: f7fe400fbc am: 1140168066 am: 100e5a256b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773605

Change-Id: Ibe08bb69abd443fe479da6afedb48baf88093559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 16:29:02 +00:00
Treehugger Robot
633fde4719 Merge "Remove unnecessary arch variant for patch module" into main am: aa46295842
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775981

Change-Id: Ifba6c7e33083b7b1873354470b5bcd208d357702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 16:12:02 +00:00
Christopher Parsons
100e5a256b Merge "Dont write data attrs for cc lib rules" into main am: f7fe400fbc am: 1140168066
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773605

Change-Id: I90c6d3c27ae338913d5927fd5790b6e1196ca18d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 15:35:05 +00:00
Treehugger Robot
aa46295842 Merge "Remove unnecessary arch variant for patch module" into main 2023-10-06 15:20:20 +00:00
Christopher Parsons
1140168066 Merge "Dont write data attrs for cc lib rules" into main am: f7fe400fbc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773605

Change-Id: I475de8a01516bf66fbd46c3ccc66ddfe96dc8168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 15:01:39 +00:00
Christopher Parsons
f7fe400fbc Merge "Dont write data attrs for cc lib rules" into main 2023-10-06 14:09:07 +00:00
Alyssa Ketpreechasawat
64528895c0 Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main am: 5cdd22700e am: 48828a1837 am: 3e49b3be0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775629

Change-Id: I4a3340715c5c0194554d4574c9c5944f4168dd92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 13:18:21 +00:00
Alyssa Ketpreechasawat
3e49b3be0a Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main am: 5cdd22700e am: 48828a1837
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775629

Change-Id: I07c70a1dd265b24cd5b54b52663a6c6a0797034e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 12:43:59 +00:00
Alyssa Ketpreechasawat
48828a1837 Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main am: 5cdd22700e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775629

Change-Id: Idffc8e2b98543b4f67aabc0ee066603bb55c2791
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 12:10:01 +00:00
Alyssa Ketpreechasawat
5cdd22700e Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main 2023-10-06 10:56:29 +00:00
Alyssa Ketpreechasawat
1d2881c1fb Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main am: affbb8d206 am: 40ed4395ab am: 33eb8c5a6d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777308

Change-Id: I62ec9b00bc766764160013c0ee70928650126aff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 10:26:44 +00:00
Xin Li
6a3d1e3428 [automerger skipped] Merge "Merge Android 14" into main am: 5c7d0cfb7d -s ours am: 0a5d8bac49 -s ours am: 64e0299ecf -s ours
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a is already in history

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

Change-Id: I248e3a26b2bef961ac6d716a7eb35c9f5575b3e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:55:05 +00:00
Xin Li
20a865a2cf [automerger skipped] Merge Android 14 am: 5a38034916 -s ours am: 91b0c64df5 -s ours am: 1044e8491a -s ours
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a is already in history

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

Change-Id: I0e765b7cc5d185f9cbe7e783c331a2084e230036
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:50:21 +00:00
Alyssa Ketpreechasawat
33eb8c5a6d Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main am: affbb8d206 am: 40ed4395ab
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777308

Change-Id: Ia877e9178f877f696868222bba1e5f985a8b92d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:36:10 +00:00
Xin Li
64e0299ecf [automerger skipped] Merge "Merge Android 14" into main am: 5c7d0cfb7d -s ours am: 0a5d8bac49 -s ours
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a is already in history

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

Change-Id: I411c4295715d01ded52649057e9fdd903bb1a4b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 09:03:13 +00:00
Xin Li
1044e8491a [automerger skipped] Merge Android 14 am: 5a38034916 -s ours am: 91b0c64df5 -s ours
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a is already in history

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

Change-Id: Id284b6151b56a2f6207dbd3c77e4c490f5cea3c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:58:43 +00:00
Alyssa Ketpreechasawat
40ed4395ab Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main am: affbb8d206
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777308

Change-Id: I5e5dbbfe5a744520ac519799540174b6f81f7f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 08:16:37 +00:00
Xin Li
0a5d8bac49 [automerger skipped] Merge "Merge Android 14" into main am: 5c7d0cfb7d -s ours
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a is already in history

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

Change-Id: I4879ee8e881a980a8f862835ce9a8703b8178545
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:56:26 +00:00
Xin Li
91b0c64df5 [automerger skipped] Merge Android 14 am: 5a38034916 -s ours
am skip reason: Merged-In Idc0ff2f20e54b81cfdf61472a72e9cb027f60554 with SHA-1 863e33471a is already in history

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

Change-Id: Ida05ed512d0e3d7de12bfd4254a23d1c76a3f8ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 07:51:40 +00:00