Commit Graph

55947 Commits

Author SHA1 Message Date
Spandan Das
d4cb14b66e Merge "Do not propagate strict_updatability linting to conscrypt and framework-media java_sdk_libraries" am: 183ed1044c am: d2f5f1c690 am: 667639eda2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2043123

Change-Id: Ice8dce7d620ee8ecf71c9b701a884289230f7aa5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:38:47 +00:00
Trevor Radcliffe
5bbdd58cea Merge "Allow appending artifact in dist with product name" am: dadc037ef3 am: 2705a090ca am: 04d3400178
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034743

Change-Id: I8901ad40feecd2ff4dc6cbb405f6cdd2f6dc9a78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:38:34 +00:00
Spandan Das
667639eda2 Merge "Do not propagate strict_updatability linting to conscrypt and framework-media java_sdk_libraries" am: 183ed1044c am: d2f5f1c690
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2043123

Change-Id: I3b95c331c3a99edba0c76bd93eab811d3cbde261
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:17:25 +00:00
Trevor Radcliffe
04d3400178 Merge "Allow appending artifact in dist with product name" am: dadc037ef3 am: 2705a090ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034743

Change-Id: Id4bc35c39e167bcaf6559ddcaff8916bc11555dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:16:28 +00:00
Spandan Das
d2f5f1c690 Merge "Do not propagate strict_updatability linting to conscrypt and framework-media java_sdk_libraries" am: 183ed1044c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2043123

Change-Id: Ice945ab22199b5b552a9a68f31b8eea9c4d879d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:02:53 +00:00
Trevor Radcliffe
2705a090ca Merge "Allow appending artifact in dist with product name" am: dadc037ef3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034743

Change-Id: I0b6fbfbbc340b2d278057a1d8b030a9cdb51fe39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 16:59:04 +00:00
Spandan Das
183ed1044c Merge "Do not propagate strict_updatability linting to conscrypt and framework-media java_sdk_libraries" 2022-03-25 15:05:06 +00:00
Trevor Radcliffe
dadc037ef3 Merge "Allow appending artifact in dist with product name" 2022-03-25 14:34:23 +00:00
Yi Kong
6233591d63 Merge "Update to clang-r450784" am: 846a25912d am: 5c1c1cc020 am: 8b5f050b64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2027885

Change-Id: I9fc50c9978723c4198e94c647c1f3dea56a6d7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 06:47:08 +00:00
Yi Kong
8b5f050b64 Merge "Update to clang-r450784" am: 846a25912d am: 5c1c1cc020
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2027885

Change-Id: I574da4949e60a9cf9ef86dbe733edecdc2af75db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 06:32:57 +00:00
Yi Kong
5c1c1cc020 Merge "Update to clang-r450784" am: 846a25912d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2027885

Change-Id: I91d23b723f4d1fd4871a88e44d36cc966b086050
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 06:07:49 +00:00
Yi Kong
846a25912d Merge "Update to clang-r450784" 2022-03-25 05:49:48 +00:00
Yi Kong
75ce5d3320 Update to clang-r450784
Test: presubmit
Bug: 219872355
Change-Id: I3cd5f42d887b07929906e08d7d9f1a677b8a4403
2022-03-25 04:30:53 +00:00
Spandan Das
2cf278e75b Do not propagate strict_updatability linting to conscrypt
and framework-media java_sdk_libraries

Tmp fix for
https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=errorprone&lkgb=8352129&lkbb=8353967&fkbb=8352538

Test: m
out/soong/.intermediates/external/conscrypt/conscrypt.module.public.api.stubs.system/android_common/lint/lint-baseline.xml
Test: (internal CI target) https://android-build.googleplex.com/builds/abtd/run/L67700000953708519
Bug: 182349282
Bug: 226637002
Bug: 226608044

Change-Id: I17e540877200f59bfd51e69e57d8bcca6cf3850f
2022-03-25 02:31:20 +00:00
Spandan Das
a1ec6ead90 Merge changes I4c373b29,I9ccda6fc,I1b390b0e,I30151217 am: ad40fffa64 am: 3dd2985871 am: db71cd071c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1977412

Change-Id: Ibbbeaaffb3a8baad67f50699d10a499155c3fd88
2022-03-24 17:59:24 +00:00
Spandan Das
db71cd071c Merge changes I4c373b29,I9ccda6fc,I1b390b0e,I30151217 am: ad40fffa64 am: 3dd2985871
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1977412

Change-Id: I499bec2b5349a698d3a64887dc9e66f3ddc2586d
2022-03-24 17:25:10 +00:00
Spandan Das
3dd2985871 Merge changes I4c373b29,I9ccda6fc,I1b390b0e,I30151217 am: ad40fffa64
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1977412

Change-Id: I94b4d8667a3fb5fcb4e7212250b34452cf42634d
2022-03-24 17:04:15 +00:00
Spandan Das
ad40fffa64 Merge changes I4c373b29,I9ccda6fc,I1b390b0e,I30151217
* changes:
  Do not propagate strict updatability linting to libcore/
  Create allowlist to skip strict updatability lint check
  Propagate strict_updatability_linting to transitive deps of updatable apexes
  Export LintDepSetsIntf from java package
2022-03-24 16:38:20 +00:00
Andrei-Valentin Onea
778676f837 Merge "Revert "Prevent unspecified values in soong_config_string_variable"" am: b47e89f2d1 am: dc8995fb1f am: bb8e21aace
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2041963

Change-Id: I51577638f116d4b8e532dfa38535e5028c7b11f9
2022-03-24 15:30:59 +00:00
Andrei-Valentin Onea
bb8e21aace Merge "Revert "Prevent unspecified values in soong_config_string_variable"" am: b47e89f2d1 am: dc8995fb1f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2041963

Change-Id: I56d0f1556fa40c0a895628f88898aea29019e875
2022-03-24 15:09:06 +00:00
Trevor Radcliffe
90727f4576 Allow appending artifact in dist with product name
Some modules need to have their artifacts copied to dist with the
product name appended. This CL enables that functionality in a
boolean Soong property called append_artifact_with_product.

Fixes: 224561567
Test: Unit tests and build relevant target/modules
Change-Id: I4b824d4001679cebf0a9059be2d090d33a310933
2022-03-24 14:46:18 +00:00
Andrei-Valentin Onea
dc8995fb1f Merge "Revert "Prevent unspecified values in soong_config_string_variable"" am: b47e89f2d1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2041963

Change-Id: Id0fbdaaed89124e22b00d743c4518bd4e4dc93c2
2022-03-24 14:32:35 +00:00
Andrei-Valentin Onea
b47e89f2d1 Merge "Revert "Prevent unspecified values in soong_config_string_variable"" 2022-03-24 14:11:18 +00:00
Andrei-Valentin Onea
38944c70c4 Revert "Prevent unspecified values in soong_config_string_variable"
This reverts commit 542905a280.

Reason for revert: This check is breaking multiple builds, creating fixes to minimize re-land work.

Change-Id: I6431bd0864f49781910dad787e1ba9375b9931b3
2022-03-24 13:52:58 +00:00
Treehugger Robot
8f62e437a5 Merge "Prevent unspecified values in soong_config_string_variable" am: 1da556928a am: 7ab5956663 am: 055c213828
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030432

Change-Id: I9b726a03b5dff7c5cd4f2fe2957884fae61b8f92
2022-03-24 05:00:16 +00:00
Treehugger Robot
055c213828 Merge "Prevent unspecified values in soong_config_string_variable" am: 1da556928a am: 7ab5956663
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030432

Change-Id: I3d5201c85140f4ce21fa5b79c8535630205b47bf
2022-03-24 04:35:15 +00:00
Treehugger Robot
7ab5956663 Merge "Prevent unspecified values in soong_config_string_variable" am: 1da556928a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030432

Change-Id: I06c567c8c442d27111e55f5b6ed1587bce245865
2022-03-24 04:10:08 +00:00
Treehugger Robot
1da556928a Merge "Prevent unspecified values in soong_config_string_variable" 2022-03-24 00:44:47 +00:00
Colin Cross
2b6b13accf Merge "Collect deps from r8" am: 057beb2146 am: c20adfad25 am: 9c495b2617
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034623

Change-Id: I20fdfa8e7000cf44bab7803d151044f2028dfb41
2022-03-22 17:42:51 +00:00
Sam Delmerico
31dd228d53 Merge "add module type allowlist to bp2build" am: f241e72b57 am: cc64a39195 am: 41ce082b83
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2013524

Change-Id: Ied39e3c8330de1f8200110b1974be490b36c8f7c
2022-03-22 17:42:29 +00:00
Colin Cross
9c495b2617 Merge "Collect deps from r8" am: 057beb2146 am: c20adfad25
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034623

Change-Id: I46aa9831a8ff4cd4f7a7f0eca886c824a47e7fbe
2022-03-22 17:21:19 +00:00
Sam Delmerico
41ce082b83 Merge "add module type allowlist to bp2build" am: f241e72b57 am: cc64a39195
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2013524

Change-Id: I2e7170cf1422c98707881f1a1da81b66591c8f59
2022-03-22 17:20:39 +00:00
Colin Cross
c20adfad25 Merge "Collect deps from r8" am: 057beb2146
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2034623

Change-Id: I96ca5f440ce5ec4ef3d698121541546feceb823b
2022-03-22 17:04:17 +00:00
Sam Delmerico
cc64a39195 Merge "add module type allowlist to bp2build" am: f241e72b57
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2013524

Change-Id: I6d06858dd336976a175fcb3206e98826099fd05f
2022-03-22 17:03:58 +00:00
Treehugger Robot
0f30727481 Merge "Handle arch/cpu variants in mixed builds" am: 9b0af33cc8 am: 2c66f0f3df am: 998cacfb7a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2033126

Change-Id: If79821d460760cd1247374bd48e45e26db4e53e8
2022-03-22 16:41:49 +00:00
Colin Cross
057beb2146 Merge "Collect deps from r8" 2022-03-22 16:40:30 +00:00
Colin Cross
22e6a6f69a Collect deps from r8
Use the new --deps-file argument to collect a deps file from r8, which
will correctly track files included by proguard flags files.

Fixes: 221956283
Test: manual
Change-Id: I92341948311c2c994cc0ae032dc19e09b2e80550
2022-03-22 16:40:13 +00:00
Sam Delmerico
f241e72b57 Merge "add module type allowlist to bp2build" 2022-03-22 16:35:49 +00:00
Treehugger Robot
998cacfb7a Merge "Handle arch/cpu variants in mixed builds" am: 9b0af33cc8 am: 2c66f0f3df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2033126

Change-Id: I9a28d3d89c9e43b7c61200b1d08c72d8e5ae1d22
2022-03-22 16:28:15 +00:00
Treehugger Robot
2c66f0f3df Merge "Handle arch/cpu variants in mixed builds" am: 9b0af33cc8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2033126

Change-Id: I8414b4143d9d75b0ce7280f023cb14997a9954ca
2022-03-22 16:12:12 +00:00
Treehugger Robot
9b0af33cc8 Merge "Handle arch/cpu variants in mixed builds" 2022-03-22 15:52:51 +00:00
Treehugger Robot
2edfe874e5 Merge "Prevent kotlinc from reading /tmp/build.txt" am: c4ad11ec28 am: ee5858c4c9 am: 4b85795a3b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030984

Change-Id: Ie3a2c512f2977b54370cb7ec8be0a4ff9f29f5f0
2022-03-22 08:23:48 +00:00
Treehugger Robot
4b85795a3b Merge "Prevent kotlinc from reading /tmp/build.txt" am: c4ad11ec28 am: ee5858c4c9
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030984

Change-Id: I3f47245352933522a97997bc9b827958403d89b0
2022-03-22 08:09:20 +00:00
Treehugger Robot
ee5858c4c9 Merge "Prevent kotlinc from reading /tmp/build.txt" am: c4ad11ec28
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2030984

Change-Id: Id5c9dee6550fc7bac02f475a776330ab209b878e
2022-03-22 07:44:46 +00:00
Treehugger Robot
c4ad11ec28 Merge "Prevent kotlinc from reading /tmp/build.txt" 2022-03-22 07:28:05 +00:00
Treehugger Robot
3d6abee56c Merge "Replace $(call my-dir) with a string literal" am: 5beafc1900 am: 0033147396 am: 8b1148783d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032783

Change-Id: Ida953f0fd1fb29b83639a63e2cbe60ba7757be0b
2022-03-22 04:07:50 +00:00
Treehugger Robot
9d5db30483 Merge "Parse variable references with #s" am: c9e38327dd am: ea0ff15f1e am: aab0b0eadc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2028744

Change-Id: I32cfb388a6f8f10282b36e2c8b8f5739fe1e1363
2022-03-22 04:07:39 +00:00
Treehugger Robot
8b1148783d Merge "Replace $(call my-dir) with a string literal" am: 5beafc1900 am: 0033147396
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032783

Change-Id: I1c68477e6337bc2a4a77f3dc65ad8a6bdf77eafa
2022-03-22 03:52:52 +00:00
Treehugger Robot
aab0b0eadc Merge "Parse variable references with #s" am: c9e38327dd am: ea0ff15f1e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2028744

Change-Id: I92b670b1ad681acfc808a340747329ec966631de
2022-03-22 03:52:44 +00:00
Treehugger Robot
0033147396 Merge "Replace $(call my-dir) with a string literal" am: 5beafc1900
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2032783

Change-Id: I615a72e07399b4ec2eb79c6217bc7d652716686f
2022-03-22 03:30:01 +00:00