Tor Norbye
db119527fd
Merge "303434307: Enable flagged API checking" into main am: 2624653aa9 am: 142049d248 am: 6cd2ac1d2d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864659
Change-Id: Id0fae5a7af67a7bba7ccd3344c71d2726e941593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 23:41:00 +00:00
Jeongik Cha
4c6ede5786
Fix typo in log in ninja.go am: d74c914e36 am: bffcb9f449 am: 4197aa826c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2868454
Change-Id: I2db744b8a3f8e987b19080346fe1e1888919d100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 23:34:43 +00:00
Treehugger Robot
b7412fd041
Merge "Remove art/test from genrule allowlist" into main am: 5eca978092 am: cfdbca0eb2 am: 1203290657
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860707
Change-Id: I369cb00f2229f0c1a1982f7ef7d80a1bdd56ddc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 23:32:38 +00:00
Treehugger Robot
d877e83ee7
Merge "individually escape results of $(locations)" into main am: 96b6a499d9 am: 16236fe350 am: 6f7f5cae93
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2863753
Change-Id: Ia5dd9f8ad441e785d91672c0fe17972f25e17637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 23:30:21 +00:00
Xin Li
4c54cacbf3
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 1804e19358 -s ours am: 2027fd55ba -s ours am: 055a3bdc9f -s ours
...
am skip reason: Merged-In Ide278450fa058b6dc565bff395f541dc7b574905 with SHA-1 f73da3ef78 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2865759
Change-Id: I65f542820ee8ee703bbe5b8aca400d559ece21c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 23:00:29 +00:00
Xin Li
da10198daa
[automerger skipped] Merge Android 14 QPR1 am: 41968c6c20 -s ours am: 5338078b15 -s ours am: 14088676e0 -s ours
...
am skip reason: Merged-In Ide278450fa058b6dc565bff395f541dc7b574905 with SHA-1 f73da3ef78 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2865759
Change-Id: I2ceed227567ac8554870cdee1f5446c1b8879440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 22:57:32 +00:00
Tor Norbye
6cd2ac1d2d
Merge "303434307: Enable flagged API checking" into main am: 2624653aa9 am: 142049d248
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864659
Change-Id: I3d31e01cc773b039e1e6ba4175ca780cc13ae77f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 22:44:56 +00:00
Jeongik Cha
4197aa826c
Fix typo in log in ninja.go am: d74c914e36 am: bffcb9f449
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2868454
Change-Id: Ia65ebfcd3d6634044f914bf19dbe68a96241d9a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 22:44:43 +00:00
Treehugger Robot
1203290657
Merge "Remove art/test from genrule allowlist" into main am: 5eca978092 am: cfdbca0eb2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860707
Change-Id: I3ac92dc466dd62625f4ba00da0950be5fd6941b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 22:42:20 +00:00
Treehugger Robot
6f7f5cae93
Merge "individually escape results of $(locations)" into main am: 96b6a499d9 am: 16236fe350
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2863753
Change-Id: Iad9ebdbd8f351ba205dd8d4cacc8133c24607aa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 22:42:08 +00:00
Xin Li
055a3bdc9f
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 1804e19358 -s ours am: 2027fd55ba -s ours
...
am skip reason: Merged-In Ide278450fa058b6dc565bff395f541dc7b574905 with SHA-1 f73da3ef78 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2865759
Change-Id: Ie01d71606e0e3bf598a62e2575195d1eea2a25e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 22:05:20 +00:00
Xin Li
14088676e0
[automerger skipped] Merge Android 14 QPR1 am: 41968c6c20 -s ours am: 5338078b15 -s ours
...
am skip reason: Merged-In Ide278450fa058b6dc565bff395f541dc7b574905 with SHA-1 f73da3ef78 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2865759
Change-Id: I2f100334950427fb2a9a4753acfab934ddac39e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 22:02:20 +00:00
Tor Norbye
142049d248
Merge "303434307: Enable flagged API checking" into main am: 2624653aa9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864659
Change-Id: Ia8d79a23429c3e15c4e3fb43942de53061a24a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 21:46:53 +00:00
Jeongik Cha
bffcb9f449
Fix typo in log in ninja.go am: d74c914e36
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2868454
Change-Id: I5158c0bda9a8826659c2bea21be435775626c25e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 21:44:41 +00:00
Treehugger Robot
cfdbca0eb2
Merge "Remove art/test from genrule allowlist" into main am: 5eca978092
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2860707
Change-Id: I6d6b573d56513745048daf82ae95bff471d840e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 21:39:21 +00:00
Treehugger Robot
16236fe350
Merge "individually escape results of $(locations)" into main am: 96b6a499d9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2863753
Change-Id: Ie4bbb87fa72cbab8bb996ca1bf1d8ae54df066f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 21:34:47 +00:00
Xin Li
2027fd55ba
[automerger skipped] Merge "Merge Android 14 QPR1" into main am: 1804e19358 -s ours
...
am skip reason: Merged-In Ide278450fa058b6dc565bff395f541dc7b574905 with SHA-1 f73da3ef78 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2865759
Change-Id: I607ed9583970b33f1c508dc26d5644a76213f5da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 21:19:34 +00:00
Xin Li
5338078b15
[automerger skipped] Merge Android 14 QPR1 am: 41968c6c20 -s ours
...
am skip reason: Merged-In Ide278450fa058b6dc565bff395f541dc7b574905 with SHA-1 f73da3ef78 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2865759
Change-Id: I4cafafdd6ea7099c778a0e23d143cb74778cd56d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-11 21:16:31 +00:00
Tor Norbye
2624653aa9
Merge "303434307: Enable flagged API checking" into main
2023-12-11 18:14:56 +00:00
Jeongik Cha
d74c914e36
Fix typo in log in ninja.go
...
Test: n/a
Bug: 292304818
Change-Id: I6dcb6bb3e84e15292cbd3acc613c744e3ec039f8
2023-12-11 11:41:16 +00:00
Treehugger Robot
5eca978092
Merge "Remove art/test from genrule allowlist" into main
2023-12-09 01:10:55 +00:00
Treehugger Robot
96b6a499d9
Merge "individually escape results of $(locations)" into main
2023-12-09 01:10:51 +00:00
Xin Li
1804e19358
Merge "Merge Android 14 QPR1" into main
2023-12-09 00:11:54 +00:00
Yu Liu
3d9c6e9169
Merge "Remove the code for bazel when reading ReleaseAconfigValueSets." into main am: 65287d5dc2 am: 1a91da57f8 am: bac244d6cb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864661
Change-Id: Ie6a3fe572b010c918dcb75a2d12d50a56daa3c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 23:17:17 +00:00
Colin Cross
8c11256574
Merge "Remove bp2build and bazel from soong_ui" into main am: e51c6e4109 am: b5943280a7 am: 029533e94f
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864662
Change-Id: I7a9f1ee6eb7f8f68d3ea286f07fed1488b45d3e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 23:17:04 +00:00
Yu Liu
bac244d6cb
Merge "Remove the code for bazel when reading ReleaseAconfigValueSets." into main am: 65287d5dc2 am: 1a91da57f8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864661
Change-Id: I47474287285a9fefa630b79ada5623fae56c20ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 22:45:33 +00:00
Colin Cross
029533e94f
Merge "Remove bp2build and bazel from soong_ui" into main am: e51c6e4109 am: b5943280a7
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864662
Change-Id: Ia621b7f0053f4702decf86e06ff12168ac0a78a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 22:45:15 +00:00
Yu Liu
1a91da57f8
Merge "Remove the code for bazel when reading ReleaseAconfigValueSets." into main am: 65287d5dc2
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864661
Change-Id: I10fdda8cc2adfdeb8006310197fb5f1a5f4d1d21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 22:15:18 +00:00
Colin Cross
b5943280a7
Merge "Remove bp2build and bazel from soong_ui" into main am: e51c6e4109
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864662
Change-Id: Ib5f67be4d01ba331b8c01c262a43891ea09b769c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 22:15:04 +00:00
Yu Liu
65287d5dc2
Merge "Remove the code for bazel when reading ReleaseAconfigValueSets." into main
2023-12-08 21:52:59 +00:00
Colin Cross
e51c6e4109
Merge "Remove bp2build and bazel from soong_ui" into main
2023-12-08 21:43:26 +00:00
Xin Li
41968c6c20
Merge Android 14 QPR1
...
Merged-In: Ide278450fa058b6dc565bff395f541dc7b574905
Bug: 315507370
Change-Id: I1831ca9b459f19974b0030cb019157e803031511
2023-12-08 13:13:06 -08:00
Treehugger Robot
de6103b9eb
Merge "rust: add aconfig_flag support" into main am: 5ada6c2738 am: f73da3ef78 am: 83e89e81a9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2863750
Change-Id: I8448e1488bec1169befdc76158a625fcb9b14be3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 21:10:53 +00:00
Treehugger Robot
83e89e81a9
Merge "rust: add aconfig_flag support" into main am: 5ada6c2738 am: f73da3ef78
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2863750
Change-Id: I91daf177cc106edd6c36e11b9721c36db5c425ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 20:36:35 +00:00
Treehugger Robot
f73da3ef78
Merge "rust: add aconfig_flag support" into main am: 5ada6c2738
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2863750
Change-Id: Ide278450fa058b6dc565bff395f541dc7b574905
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 20:05:49 +00:00
Treehugger Robot
5ada6c2738
Merge "rust: add aconfig_flag support" into main
2023-12-08 19:35:28 +00:00
Cole Faust
a8ac7bd53f
Merge "Fix typo in the comment" into main am: 2237d24894 am: 558e2bd19c am: e0be8911de
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2865414
Change-Id: I0c0b71ed63a2f1fb142209c86da25baeb9956448
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 19:10:50 +00:00
Cole Faust
bcfc299575
Remove art/test from genrule allowlist
...
go/android-busy-beavers-sandboxing
Bug: 307824623
Test: mm in art/test
Change-Id: Ic37343ad873f71461db984b030f6beda5279207c
2023-12-08 10:57:27 -08:00
Cole Faust
ce74a59bb2
individually escape results of $(locations)
...
proptools.ShellEscape escapes mostly by surrounding the string in
quotes. This makes all the files from a $(locations) be passed as
one shell argument if escaping was needed. Escape them individually
so that they're still passed as separate arguments.
Bug: 307824623
Test: running art tests with aosp/2860435
Change-Id: I9940941f4a7bb4d29d9388e4d57f8cbd732b6d32
2023-12-08 10:53:59 -08:00
Cole Faust
e0be8911de
Merge "Fix typo in the comment" into main am: 2237d24894 am: 558e2bd19c
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2865414
Change-Id: I70335a0c98f91598bf9241052cc9e38d9b2adba7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 18:39:04 +00:00
Cole Faust
558e2bd19c
Merge "Fix typo in the comment" into main am: 2237d24894
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2865414
Change-Id: I6ecf98ae6cd00dc10518716673acea89f7114f2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 18:09:10 +00:00
Cole Faust
2237d24894
Merge "Fix typo in the comment" into main
2023-12-08 17:32:43 +00:00
Tor Norbye
cabafdeee0
303434307: Enable flagged API checking
...
Also downgrade the new UseSdkSuppress check from error to warning.
And temporarily downgrades FlaggedApi from error to warning until
existing violations are resolved.
Test: The build
Bug: 303434307
Change-Id: Id7802621d567815470dee1aeb815abe214f098cd
2023-12-08 15:44:20 +00:00
Jihoon Kang
59bb904d6c
Merge changes from topic "aconfig_dump_map" into main am: 25c187cc7d am: 1ed5d5ca20 am: 1befeeb5e8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854663
Change-Id: I18069b9fa74f1c72527bff397c61bc5510e7a684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 11:31:22 +00:00
Jihoon Kang
1befeeb5e8
Merge changes from topic "aconfig_dump_map" into main am: 25c187cc7d am: 1ed5d5ca20
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854663
Change-Id: Iacd72283671593f0914420024451a347d9125c36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 10:57:22 +00:00
Jihoon Kang
1ed5d5ca20
Merge changes from topic "aconfig_dump_map" into main am: 25c187cc7d
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2854663
Change-Id: I0d9212e36959c7964e6cbff7228b5ff5dabad32a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 10:27:20 +00:00
Jihoon Kang
25c187cc7d
Merge changes from topic "aconfig_dump_map" into main
...
* changes:
Add aconfig flag support for android_app
Add aconfig flag value text file in aconfig_declarations provider
2023-12-08 09:48:13 +00:00
Yuichiro Hanada
e42ac1c79b
Fix typo in the comment
...
Bug: None
Test: m soong_docs and check the generated soong_build.html
Change-Id: I72dd87915f8f5225600365d8ef3f6b9c337a5dbc
2023-12-08 12:23:15 +09:00
Cole Faust
8172cfb509
Merge "Revert "Handle symlinks in sbox"" into main am: 25861686fe am: 08f46ee8d4 am: ce96639b98
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864655
Change-Id: Ib41661f946ae317dd05c1381dea74b0fc2b682d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 02:28:56 +00:00
Cole Faust
ce96639b98
Merge "Revert "Handle symlinks in sbox"" into main am: 25861686fe am: 08f46ee8d4
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2864655
Change-Id: Iee7203f3f75195524bd606b6c74a1ac5e75334d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-08 01:55:32 +00:00