Commit Graph

40487 Commits

Author SHA1 Message Date
Treehugger Robot
dd62393313 Merge changes Id33bf640,I4d67b9b9 am: 8c56183fb7 am: b17e061ae9 am: a7fe23c458
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663139

Change-Id: Ic1434fc150e802f3a6e8b58a9a6f3e16e93da146
2021-04-06 05:29:49 +00:00
Treehugger Robot
a7fe23c458 Merge changes Id33bf640,I4d67b9b9 am: 8c56183fb7 am: b17e061ae9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663139

Change-Id: I0128e2d5bf70a7cce8b16b78a62434c819b09de4
2021-04-06 04:42:35 +00:00
Treehugger Robot
b17e061ae9 Merge changes Id33bf640,I4d67b9b9 am: 8c56183fb7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663139

Change-Id: I612f736835ecd11d9317cc1dbf3f6508df0a7f46
2021-04-06 03:58:29 +00:00
Treehugger Robot
8c56183fb7 Merge changes Id33bf640,I4d67b9b9
* changes:
  Don't use incorrect version names like VER or BOARD even in tests
  SdkSpec = Scope + ApiLevel
2021-04-06 03:18:16 +00:00
Colin Cross
713718317f Merge "Remove support for unsandboxed metalava" am: 7fef94f57b am: b60432e4c8 am: f9b5ed2b8e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660772

Change-Id: I8b624e1844d508121ad613110019d4478043657a
2021-04-06 01:33:50 +00:00
Colin Cross
f9b5ed2b8e Merge "Remove support for unsandboxed metalava" am: 7fef94f57b am: b60432e4c8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660772

Change-Id: I414edb7808f35e5db56edf6d1b0693cfe288b33d
2021-04-06 00:42:50 +00:00
Colin Cross
b60432e4c8 Merge "Remove support for unsandboxed metalava" am: 7fef94f57b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660772

Change-Id: I0994f58d3e8e445b082d7192672ddf035041aefb
2021-04-06 00:00:28 +00:00
Colin Cross
7fef94f57b Merge "Remove support for unsandboxed metalava" 2021-04-05 23:23:00 +00:00
Sophie Zheng
282483013e [automerger skipped] Merge "NDK API coverage" into mainline-prod am: d148a481fd -s ours
am skip reason: skip tag Change-Id I799e03ad7d81a4184229f658fd6c8824b9ba6e1f with SHA-1 ae5da5ba78 is already in history

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

Change-Id: Ie0faef3f349a49f08b6637dcc2510c2accd4b0b8
2021-04-05 21:14:19 +00:00
Christopher Parsons
1d1d206874 Merge "Use correct includes for mixed build gen headers" am: 012ae1f4e0 am: 349bd6a36b am: 5002f7beba
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660760

Change-Id: I73b863ce8cc06cccf8efffb6cd4893db8cc8cb6a
2021-04-05 20:53:08 +00:00
Joel Galenson
09577faf2d Merge "Add system/core/libstats to the Rust allowed list." am: 1301b5ccad am: e2cc68f506 am: ecce9fbc85
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658923

Change-Id: I092d27d99dc174f8d4de7a321252e66010443fa4
2021-04-05 20:52:29 +00:00
Christopher Parsons
5002f7beba Merge "Use correct includes for mixed build gen headers" am: 012ae1f4e0 am: 349bd6a36b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660760

Change-Id: I0543398b469b2ffa825712268b258ec4c0158fef
2021-04-05 20:06:25 +00:00
Joel Galenson
ecce9fbc85 Merge "Add system/core/libstats to the Rust allowed list." am: 1301b5ccad am: e2cc68f506
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658923

Change-Id: Ib6b60163e986e0024d67991a74af8979e4a8a67a
2021-04-05 20:06:12 +00:00
Sophie Zheng
d148a481fd Merge "NDK API coverage" into mainline-prod 2021-04-05 20:03:58 +00:00
Sophie Zheng
8fe1697129 [automerger skipped] Merge "NDK API coverage" into mainline-prod am: 42e89aa6c4 -s ours
am skip reason: skip tag Change-Id I6150d5bda0d59828a985cd2ab5dd0aa38a7987c3 with SHA-1 d3e2742ad2 is already in history

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

Change-Id: Iea3858ecad2844c6529ed75b832fbd93b7b4c0f6
2021-04-05 19:26:31 +00:00
Christopher Parsons
349bd6a36b Merge "Use correct includes for mixed build gen headers" am: 012ae1f4e0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660760

Change-Id: I6107b03160e7976774d522bdb9f2e5222c1818ba
2021-04-05 19:23:03 +00:00
Joel Galenson
e2cc68f506 Merge "Add system/core/libstats to the Rust allowed list." am: 1301b5ccad
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658923

Change-Id: I6b59cc2642c4589092189d338419641762a14f8b
2021-04-05 19:22:15 +00:00
Christopher Parsons
012ae1f4e0 Merge "Use correct includes for mixed build gen headers" 2021-04-05 19:03:47 +00:00
Sophie Zheng
42e89aa6c4 Merge "NDK API coverage" into mainline-prod 2021-04-05 18:56:13 +00:00
Joel Galenson
1301b5ccad Merge "Add system/core/libstats to the Rust allowed list." 2021-04-05 18:50:47 +00:00
Ivan Lozano
a4b598a948 Merge "rust: Update libfuzzer flags for rust_fuzz" am: d235269392 am: 5e4d586b7f am: 9d454859b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663380

Change-Id: Ieea5aa755363f60c85423bccb29c70636364ca61
2021-04-05 17:14:41 +00:00
Ivan Lozano
9d454859b3 Merge "rust: Update libfuzzer flags for rust_fuzz" am: d235269392 am: 5e4d586b7f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663380

Change-Id: I0fdd3241cc927900207a970c46cf9f6caa619ddf
2021-04-05 16:32:39 +00:00
Ivan Lozano
5e4d586b7f Merge "rust: Update libfuzzer flags for rust_fuzz" am: d235269392
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663380

Change-Id: I579d4360e4decc137078c9677681abde86bc8c92
2021-04-05 15:47:50 +00:00
Ivan Lozano
d235269392 Merge "rust: Update libfuzzer flags for rust_fuzz" 2021-04-05 15:05:00 +00:00
Liz Kammer
fe562e4749 Merge "Add bazel_module properties to cc_defaults" am: 9962daec01 am: b54a6c4457 am: 2fde0e00cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660764

Change-Id: If1a59dfce1534d3de561c7f6aea136dbf43fa4c4
2021-04-05 14:27:58 +00:00
Liz Kammer
2fde0e00cf Merge "Add bazel_module properties to cc_defaults" am: 9962daec01 am: b54a6c4457
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660764

Change-Id: I5a7929beb871164c333dd3289b0d3759dcbdc022
2021-04-05 13:44:08 +00:00
Liz Kammer
b54a6c4457 Merge "Add bazel_module properties to cc_defaults" am: 9962daec01
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1660764

Change-Id: I67f01a4339bfeef793ca2d62ea73e68527746eb5
2021-04-05 13:04:00 +00:00
Liz Kammer
9962daec01 Merge "Add bazel_module properties to cc_defaults" 2021-04-05 12:33:21 +00:00
Jingwen Chen
f69daeccb5 Merge "Add os/target configurable selects for label list attributes." am: 1a6bbbd990 am: 16795963e9 am: 13c099f82d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652048

Change-Id: I1ad467167b89e94aacb82db3acfa044135743b62
2021-04-05 09:09:58 +00:00
Jingwen Chen
13c099f82d Merge "Add os/target configurable selects for label list attributes." am: 1a6bbbd990 am: 16795963e9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652048

Change-Id: Iba895d6a375e06c547293676d9eeefda45ceb08a
2021-04-05 08:29:38 +00:00
Jingwen Chen
16795963e9 Merge "Add os/target configurable selects for label list attributes." am: 1a6bbbd990
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1652048

Change-Id: I7299aee434717d8087ceeec2f5851fb129f9bef7
2021-04-05 07:40:59 +00:00
Jingwen Chen
1a6bbbd990 Merge "Add os/target configurable selects for label list attributes." 2021-04-05 07:09:48 +00:00
Jiyong Park
f58c46e36f Don't use incorrect version names like VER or BOARD even in tests
All version names will go through ApiLevelFromUser which triggers an
error when the name is not a valid one.

Bug: 175678607
Test: m
Change-Id: Id33bf64085603914d45ad7942cb8908a4734493f
2021-04-05 09:32:06 +09:00
Jiyong Park
54105c48f4 SdkSpec = Scope + ApiLevel
SdkSpec.Version was an int type. Now it becomes ApiLevel type which
is a better abstraction of the version (or api level).

Bug: 1655587
Test: m

Change-Id: I4d67b9b9eae45f653b6af4f5b73da9e091b3dfab
2021-04-05 09:32:06 +09:00
Inseob Kim
061adc2232 Merge "Support super image size automatic calculation" am: 0774773a65 am: 726c75b9d9 am: 85b912ef86
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658164

Change-Id: I106e28ea155f645f5aa5f7341aecd9de461829ee
2021-04-04 12:31:14 +00:00
Inseob Kim
85b912ef86 Merge "Support super image size automatic calculation" am: 0774773a65 am: 726c75b9d9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658164

Change-Id: Ie386bb6c66ea713c93f98fc7d0f2e7aab82fc435
2021-04-04 11:48:51 +00:00
Inseob Kim
726c75b9d9 Merge "Support super image size automatic calculation" am: 0774773a65
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1658164

Change-Id: I5acf77756b7bd85be2c111510d88058efc3acbe6
2021-04-04 11:11:17 +00:00
Inseob Kim
0774773a65 Merge "Support super image size automatic calculation" 2021-04-04 10:46:25 +00:00
Jiyong Park
7f61ac4c8b Merge "Move java.sdkSpec to the android package" am: d4fa8fc107 am: 7ff95eca2f am: f19d2d57b3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655587

Change-Id: I5c5d25a78c4f51876289dc450874d83c5a9c90b6
2021-04-03 13:16:03 +00:00
Jiyong Park
f19d2d57b3 Merge "Move java.sdkSpec to the android package" am: d4fa8fc107 am: 7ff95eca2f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655587

Change-Id: I748c9c8d1eebacbd379121e32c54eff237ca0a80
2021-04-03 12:34:19 +00:00
Jiyong Park
7ff95eca2f Merge "Move java.sdkSpec to the android package" am: d4fa8fc107
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1655587

Change-Id: I0a90dcb1342c670a0e32e081051069aad492fc48
2021-04-03 11:48:14 +00:00
Jiyong Park
d4fa8fc107 Merge "Move java.sdkSpec to the android package" 2021-04-03 11:20:10 +00:00
Yi Kong
bd1e6cda59 Merge "Fix toc.sh, llvm-nm does not recognise '-f P' option" am: 15f5d688d0 am: 171c509cb9 am: 4650a7c49f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663144

Change-Id: Ia0574df4598f6a65fdee0f91ad6028159269d1a2
2021-04-03 06:10:57 +00:00
Yi Kong
4650a7c49f Merge "Fix toc.sh, llvm-nm does not recognise '-f P' option" am: 15f5d688d0 am: 171c509cb9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663144

Change-Id: Ibb341112d958c50381a103e341e9873cf3728798
2021-04-03 05:27:45 +00:00
Rupert Shuttleworth
17e838231a Merge "Allow Bazel actions to see the SHELL variable." am: 176cf46f40 am: 523b14d5c4 am: fe6f93d551
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663462

Change-Id: I9a7c2b5ba0d1ac2ff226717e1b123b7b987f0169
2021-04-03 05:08:52 +00:00
Yi Kong
171c509cb9 Merge "Fix toc.sh, llvm-nm does not recognise '-f P' option" am: 15f5d688d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663144

Change-Id: I27e1f231813a350a3eabfc17aba6ae172546710b
2021-04-03 04:46:41 +00:00
Rupert Shuttleworth
fe6f93d551 Merge "Allow Bazel actions to see the SHELL variable." am: 176cf46f40 am: 523b14d5c4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663462

Change-Id: Ib739ec5b01930d4385fbfd545c5d1a89dcc889bd
2021-04-03 04:20:50 +00:00
Yi Kong
15f5d688d0 Merge "Fix toc.sh, llvm-nm does not recognise '-f P' option" 2021-04-03 03:59:26 +00:00
Rupert Shuttleworth
523b14d5c4 Merge "Allow Bazel actions to see the SHELL variable." am: 176cf46f40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1663462

Change-Id: I26595f770e8db4b3ffa8b45f74414aaed3bad81e
2021-04-03 03:41:36 +00:00
Rupert Shuttleworth
176cf46f40 Merge "Allow Bazel actions to see the SHELL variable." 2021-04-03 03:07:36 +00:00