Treehugger Robot
23bbcdffe9
Merge "Allowlist AndroidFrameworkLintChecker" into main am: 6bc88ae14d
am: 2579fbad62
am: 8cd59aee93
am: 6ec3b31d6c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745835
Change-Id: I6daf9ac129233136c21496f2a73d257955f96d3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:56:51 +00:00
Treehugger Robot
dbc400743b
Merge "Update Headers_only to a bool pointer" into main am: 9ea1d061b7
am: 077566faf4
am: 459c689b9d
am: 4de5c1d0be
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775982
Change-Id: I3a0141cc058747eddf20e470d284f0080de9f909
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:56:43 +00:00
Alyssa Ketpreechasawat
0d617b6248
Merge "Revert "Revert "Disable hiddenapi check for building from prebuilts.""" into main am: 2711ce2e1f
am: fc3ab39cae
am: 7209384e9a
am: c5e1ac2ea6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775656
Change-Id: Ib22b967f57a127ff0a4ad4f2300edaa2d2d6a292
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:56:24 +00:00
Dan Albert
98a01ec7e4
Merge "Fix error message to still be an error." into main am: dbd4a25cf7
am: 9f98477e8f
am: 8dcd17afb8
am: de74892eae
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775983
Change-Id: I7c97ea19b6f91f68bdd645afb8c49de5eb145e87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:55:27 +00:00
Vinh Tran
6d0bc242a2
Merge "Export device arm64 rust flags to Bazel" into main am: 001ec85bcc
am: 59ffcbd8de
am: b1182cefa4
am: af3b2d6e00
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773604
Change-Id: Iecec6b36a0ae6044c87790f7fd04ab07119f9849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:52:23 +00:00
Mark Dacek
6f253ea1c7
Merge "Revert "Revert "Modify symlink_forest to rerun when soong_build has changed.""" into main am: e0b6329384
am: 5428ba4965
am: ab00c0109f
am: 21e3f0fc73
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2771971
Change-Id: I28e92f025b4f2020bca5df367fd6c0576ed1dd7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 20:52:14 +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
63e916ede3
Merge "Remove unnecessary arch variant for patch module" into main am: aa46295842
am: 633fde4719
am: 21698a7c14
am: 14b6e7a77f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775981
Change-Id: Ie536712bb20b97f0723884abb02b770b5ef0d2a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 18:51:11 +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
Romain Jobredeaux
69e2d83e8d
Allowlist prebuilt version aapt2
...
Bug: 303786272
Test: CI + Manual build
Change-Id: I0a748430e4f2c4d77c6564562c3a85b0dc4368e4
2023-10-06 13:46:42 -04:00
Romain Jobredeaux
f2e3c111ec
Allowlist kotlinx_coroutines_android
...
Change-Id: Ib097d43e0abb6a94cdb4e0ff13d6ac3e0c13da9f
2023-10-06 13:46:15 -04: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
Spandan Das
046c8b4f19
Allowlist jni libs of FrameworksNetsTests
...
This dir contains the following jni libs
- libnetworkstatsfactorytestjni
- libandroid_net_frameworktests_util_jni
Bug: 297405814
Test: b build $(bmod libnetworkstatsfactorytestjni) --config=android
Test: b build $(bmod libandroid_net_frameworktests_util_jni) --config=android
Change-Id: I3905396cab8df5ebbbf12eafcd9f96cde8305697
2023-10-06 17:18:45 +00:00
Christopher Parsons
9ad29be603
Merge "Dont write data attrs for cc lib rules" into main am: f7fe400fbc
am: 1140168066
am: 100e5a256b
am: c3757c0c02
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2773605
Change-Id: I255ae75214504678c7336c5a820218a2b241de3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 17:04:01 +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
4afb4344c9
Merge "Revert "Added new framework-pdf jar inside MediaProvider module"" into main am: 5cdd22700e
am: 48828a1837
am: 3e49b3be0a
am: 64528895c0
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2775629
Change-Id: Iaedb34e177171cfed0b04b67c3918fb5a8bcbc82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 13:53:24 +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
37cd54a163
Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main am: affbb8d206
am: 40ed4395ab
am: 33eb8c5a6d
am: 1d2881c1fb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777308
Change-Id: I35b57c71fee0f715f5ca02e51aabedf0180fe82b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:28:23 +00:00
Xin Li
1f526218c2
[automerger skipped] Merge "Merge Android 14" into main am: 5c7d0cfb7d
-s ours am: 0a5d8bac49
-s ours am: 64e0299ecf
-s ours am: 6a3d1e3428
-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: I2f2b194400e71c336213d2e497bd802fe8a7a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06 11:04:56 +00:00