Commit Graph

77680 Commits

Author SHA1 Message Date
Krzysztof Kosiński
2ba34e8f72 Clean up obsolete aliases for Truth. am: 5a55439d12 am: fd3d016a70 am: f0b5c69f64 am: 0ed7550fbe am: 04dc3cc6d8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2778191

Change-Id: I5d1c5e072d2a4050012916299961c07dd5e78242
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-08 06:03:51 +00:00
Krzysztof Kosiński
04dc3cc6d8 Clean up obsolete aliases for Truth. am: 5a55439d12 am: fd3d016a70 am: f0b5c69f64 am: 0ed7550fbe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2778191

Change-Id: I624adde4885413ee0921d4e26aad3d31b32fc722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-08 05:23:57 +00:00
Krzysztof Kosiński
0ed7550fbe Clean up obsolete aliases for Truth. am: 5a55439d12 am: fd3d016a70 am: f0b5c69f64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2778191

Change-Id: If36dc51494b8c0f1eccc1e29ff302fdb1f4ee3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-08 04:50:31 +00:00
Krzysztof Kosiński
f0b5c69f64 Clean up obsolete aliases for Truth. am: 5a55439d12 am: fd3d016a70
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2778191

Change-Id: I2100953abf25bf9fb1cbc52530002d94612c5685
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-08 04:12:44 +00:00
Krzysztof Kosiński
fd3d016a70 Clean up obsolete aliases for Truth. am: 5a55439d12
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2778191

Change-Id: Icc6cd1419034309e2a85ff44aed3fd32ba59be20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-08 03:40:12 +00:00
Krzysztof Kosiński
5a55439d12 Clean up obsolete aliases for Truth.
Bug: 255714762
Test: presubmit
Change-Id: I2d7ef129bc8cad247d805ad392f05cd9d517b67e
2023-10-07 19:59:58 +00:00
Treehugger Robot
6998fe3a76 Merge "Handle include statements with trailing whitespace" into main am: a32f556ad3 am: 4a699d0d6d am: 24a715658d am: 750d2e9c56 am: a4aa3ffab3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776869

Change-Id: I94bf4e27d083995ab7d9344d211ce1f7bbd8e4d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 01:12:03 +00:00
Treehugger Robot
0ca2e0f55a Merge "Allowlist AndroidFrameworkLintChecker" into main am: 6bc88ae14d am: 2579fbad62 am: 8cd59aee93 am: 6ec3b31d6c am: 23bbcdffe9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745835

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

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

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

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

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

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

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

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

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

Change-Id: I43cfb3178440e53a34aa044412fd40054b65012d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:47:33 +00:00
Automerger Merge Worker
0dfb1228a7 Merge "Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main am: affbb8d206 am: 40ed4395ab am: 33eb8c5a6d am: 1d2881c1fb am: 37cd54a163" into main 2023-10-07 00:47:25 +00:00
Alyssa Ketpreechasawat
ab2d3f3eed Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main am: affbb8d206 am: 40ed4395ab am: 33eb8c5a6d am: 1d2881c1fb am: 37cd54a163
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777308

Change-Id: Ifdf32cf433ff102cddb4439f1ef1594ae262bfed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:47:15 +00:00
Alyssa Ketpreechasawat
3409c759e1 Merge "Revert "Disable hiddenapi check for building from prebuilts."" into main am: affbb8d206 am: 40ed4395ab am: 33eb8c5a6d am: 1d2881c1fb am: 37cd54a163
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777308

Change-Id: I1e69d3e300bf5c285b884928e1e8973a9531c594
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:47:11 +00:00
Xin Li
6251f72580 [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: 1f526218c2 -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: I050e68c80dd283ea66be8038365f7806e06671de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:24:28 +00:00
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
Xin Li
511c56c61f [automerger skipped] Merge Android 14 am: 5a38034916 -s ours am: 91b0c64df5 -s ours am: 1044e8491a -s ours am: 20a865a2cf -s ours am: 06a1777ad6 -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: I25061737082d1c1c2344a5d0245176e82a6164df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-07 00:19:42 +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
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