Commit graph

75337 commits

Author SHA1 Message Date
Treehugger Robot
5a58172865 Merge "Remove ?= assignements to product variables" into main am: cbe61221b6 am: 07829d80db am: 0ed4cb5708 am: 0e0fe0e511
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2779549

Change-Id: Ifdd0a8cdd61ec58fd374f3846c4a91d9db1d20aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 01:39:21 +00:00
Treehugger Robot
0e0fe0e511 Merge "Remove ?= assignements to product variables" into main am: cbe61221b6 am: 07829d80db am: 0ed4cb5708
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2779549

Change-Id: I9f9cd87bc7c75df651168804c86cc72a995c852e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-10 00:50:27 +00:00
Treehugger Robot
0ed4cb5708 Merge "Remove ?= assignements to product variables" into main am: cbe61221b6 am: 07829d80db
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2779549

Change-Id: I77c1831722277b3eb732e8ac459820d6c9d47b83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 23:56:34 +00:00
Treehugger Robot
8e194b6613 Merge "Exclude REL from preview API levels." into main am: a1e713fe24 am: f6dbb57c92 am: 279ec4b393 am: cb7153bde5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776068

Change-Id: I9d7dd5a89fbfdf3f8edcda8df17da5983d808ca6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 23:33:55 +00:00
Spandan Das
0093e92002 Merge "Allowlist jni libs of FrameworksNetsTests" into main am: 7836d75592 am: 6930284ac2 am: 1faddaa40a am: 137f8c1c4f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776070

Change-Id: I2eeffc7f72cfcda7dc2870c68eed0045838a5bc4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 23:29:21 +00:00
Treehugger Robot
07829d80db Merge "Remove ?= assignements to product variables" into main am: cbe61221b6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2779549

Change-Id: I0d4ced4bc52140a0470a1f3c5985bb07cc1ee7a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 23:22:04 +00:00
Treehugger Robot
cb7153bde5 Merge "Exclude REL from preview API levels." into main am: a1e713fe24 am: f6dbb57c92 am: 279ec4b393
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776068

Change-Id: Ib52c7001576303d202b8bf9655511696a6b71104
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 22:25:05 +00:00
Treehugger Robot
cbe61221b6 Merge "Remove ?= assignements to product variables" into main 2023-10-09 22:20:16 +00:00
Spandan Das
137f8c1c4f Merge "Allowlist jni libs of FrameworksNetsTests" into main am: 7836d75592 am: 6930284ac2 am: 1faddaa40a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776070

Change-Id: I239c2541205e21423fe7af04e7325b801fc1801f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 22:16:23 +00:00
Treehugger Robot
279ec4b393 Merge "Exclude REL from preview API levels." into main am: a1e713fe24 am: f6dbb57c92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776068

Change-Id: I130dc5e0f161a83ace773c6e391263d8086fadfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 21:50:34 +00:00
Spandan Das
1faddaa40a Merge "Allowlist jni libs of FrameworksNetsTests" into main am: 7836d75592 am: 6930284ac2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776070

Change-Id: I9db756a0943815e411c00aa20fb9b17c361c9e43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 21:50:24 +00:00
Treehugger Robot
f6dbb57c92 Merge "Exclude REL from preview API levels." into main am: a1e713fe24
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776068

Change-Id: I18963937df0be9101e232832526b3e1f088157b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 21:10:06 +00:00
Spandan Das
6930284ac2 Merge "Allowlist jni libs of FrameworksNetsTests" into main am: 7836d75592
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776070

Change-Id: Ia84069ebdcca29f55e54ed3cbd6589909a7c68c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 21:08:44 +00:00
Treehugger Robot
a1e713fe24 Merge "Exclude REL from preview API levels." into main 2023-10-09 20:34:06 +00:00
Spandan Das
7836d75592 Merge "Allowlist jni libs of FrameworksNetsTests" into main 2023-10-09 19:55:00 +00:00
Cole Faust
8e15f69709 Remove ?= assignements to product variables
In make, all product variables are assigned to an empty string before
including the product config makefiles. In starlark, we don't do that
just so the memory usage is smaller. This means that in make, using
?= to assign a product config variable has no effect. Replicate this
behavior in starlark by not emitting any code for ?= assignments of
product variables.

Fixes: 304324003
Test: go test
Change-Id: Id31531506ac9e372a1bea92ce9ae8e17ae0ca70c
2023-10-09 12:26:21 -07:00
Elliott Hughes
c5d48c4537 Merge "Have the sanitizers trap rather than abort." into main am: 69cf8a3221 am: e4b133c460 am: 4cc2073fe9 am: 1ba733dee0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776235

Change-Id: I09f46d6a667f1724c40d6990f9d306ba284c6659
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 18:57:24 +00:00
Treehugger Robot
7e97b1c519 Merge changes from topic "aapt2_toggle_bazel" into main am: 37fb733466 am: 5c53e28dfe am: dd719ded06 am: 83c4bc3857
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776649

Change-Id: Id85831de3801375cbaa933c70b40b0e3b8477b25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 18:56:52 +00:00
Romain Jobredeaux
3079d8133f Allowlist kotlinx_coroutines_android am: f2e3c111ec am: 5c3cda4b18 am: a6cb845fa4 am: 9a16f22732
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776650

Change-Id: Id18c98b068d53c199b2a1e410a66b0218cf388b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 18:56:45 +00:00
Elliott Hughes
1ba733dee0 Merge "Have the sanitizers trap rather than abort." into main am: 69cf8a3221 am: e4b133c460 am: 4cc2073fe9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776235

Change-Id: I9a345a9077334f3209393bf835a55547bc64ae0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 18:26:29 +00:00
Treehugger Robot
83c4bc3857 Merge changes from topic "aapt2_toggle_bazel" into main am: 37fb733466 am: 5c53e28dfe am: dd719ded06
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776649

Change-Id: Ic75fa16feedc035a312659ecfd5abc05d5270191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 18:25:57 +00:00
Romain Jobredeaux
9a16f22732 Allowlist kotlinx_coroutines_android am: f2e3c111ec am: 5c3cda4b18 am: a6cb845fa4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776650

Change-Id: Id3173f468ab1a8965e7ee04f0df738d7ef6b65d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 18:25:54 +00:00
Elliott Hughes
4cc2073fe9 Merge "Have the sanitizers trap rather than abort." into main am: 69cf8a3221 am: e4b133c460
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776235

Change-Id: Ife3f87a2c713891804d741bfe4e24cc86ce5f6c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 18:23:40 +00:00
Treehugger Robot
dd719ded06 Merge changes from topic "aapt2_toggle_bazel" into main am: 37fb733466 am: 5c53e28dfe
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776649

Change-Id: Id09af4dee52622b249c5fd30331b1055ad24895e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 17:16:38 +00:00
Romain Jobredeaux
a6cb845fa4 Allowlist kotlinx_coroutines_android am: f2e3c111ec am: 5c3cda4b18
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776650

Change-Id: I34117c4beec83aa27e5e1882b17d3ba898959768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 17:16:34 +00:00
Elliott Hughes
e4b133c460 Merge "Have the sanitizers trap rather than abort." into main am: 69cf8a3221
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776235

Change-Id: Icd16b72ab0d83343d01cc9e03a6d20cd5ce594b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 16:44:10 +00:00
Treehugger Robot
5c53e28dfe Merge changes from topic "aapt2_toggle_bazel" into main am: 37fb733466
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776649

Change-Id: I1f98bef38495ec5107579864de25966277d87169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 16:43:36 +00:00
Romain Jobredeaux
5c3cda4b18 Allowlist kotlinx_coroutines_android am: f2e3c111ec
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2776650

Change-Id: I531dff0d5535c6ac0d4aabf71686e26080b3f2d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 16:43:29 +00:00
Elliott Hughes
69cf8a3221 Merge "Have the sanitizers trap rather than abort." into main 2023-10-09 16:08:05 +00:00
Treehugger Robot
37fb733466 Merge changes from topic "aapt2_toggle_bazel" into main
* changes:
  Allowlist prebuilt version aapt2
  Allowlist kotlinx_coroutines_android
2023-10-09 16:02:37 +00:00
Yi Kong
2e841e5631 Merge "Change lto_test to use GlobalThinLTO configuration" into main am: 0b6c4b7c08 am: b0c93d0f17 am: 556d4a56d0 am: af750247e5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774344

Change-Id: I7a4ac51700b9bd4ab8cbe46b7b8129f4b42cccb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 13:22:09 +00:00
Yi Kong
af750247e5 Merge "Change lto_test to use GlobalThinLTO configuration" into main am: 0b6c4b7c08 am: b0c93d0f17 am: 556d4a56d0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774344

Change-Id: Ifde03e5c9948f957f3f9dbef431d55ebd5740759
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 12:43:09 +00:00
Yi Kong
556d4a56d0 Merge "Change lto_test to use GlobalThinLTO configuration" into main am: 0b6c4b7c08 am: b0c93d0f17
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774344

Change-Id: I283a3d7843e4b89561abbb6d0f4cbfc7003c9acf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 12:07:48 +00:00
Yi Kong
b0c93d0f17 Merge "Change lto_test to use GlobalThinLTO configuration" into main am: 0b6c4b7c08
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2774344

Change-Id: Id045940d839ee64f5d8cec1addf91bc61a1e7f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 11:20:25 +00:00
Yi Kong
0b6c4b7c08 Merge "Change lto_test to use GlobalThinLTO configuration" into main 2023-10-09 10:41:28 +00:00
Kiyoung Kim
c2ef241726 Merge "Disable TARGET_VNDK_USE_CORE_VARIANT if VNDK is deprecated" into main am: f161d653cf am: 22508c4eb2 am: 0ccd34b149 am: c90533a119
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777368

Change-Id: Ie00278df5cb6aa45e4c13b5818407ad60ae1dd30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 08:07:33 +00:00
Kiyoung Kim
c90533a119 Merge "Disable TARGET_VNDK_USE_CORE_VARIANT if VNDK is deprecated" into main am: f161d653cf am: 22508c4eb2 am: 0ccd34b149
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777368

Change-Id: Ic7f7eac2805898852ec088b4db1cb0b6cf8abd63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 07:33:52 +00:00
Kiyoung Kim
0ccd34b149 Merge "Disable TARGET_VNDK_USE_CORE_VARIANT if VNDK is deprecated" into main am: f161d653cf am: 22508c4eb2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777368

Change-Id: I0c3da51ee74749ab238b544a57da62d7ae90394b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 06:45:43 +00:00
Kiyoung Kim
22508c4eb2 Merge "Disable TARGET_VNDK_USE_CORE_VARIANT if VNDK is deprecated" into main am: f161d653cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2777368

Change-Id: I68dcc7fb457744c966b2f173d8e5c62d91eb9624
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-09 06:11:08 +00:00
Kiyoung Kim
f161d653cf Merge "Disable TARGET_VNDK_USE_CORE_VARIANT if VNDK is deprecated" into main 2023-10-09 05:31:12 +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
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
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