Commit Graph

71164 Commits

Author SHA1 Message Date
Alix Espino
dff03221fa Merge changes from topics "errProne_bp2build_manually_enabled", "error_prone_config" into main am: 2a779ea829 am: 77a01c4809 am: 87dd2019a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2631710

Change-Id: Ic4b48b5b550e20ca0dbd3c2ccc12114f81feee83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 15:47:16 +00:00
Treehugger Robot
9c0cf2cecd Merge "Log the command line to soong.log when soong_ui starts" into main am: 90d8f5514d am: 296e7ed439 am: e7ac56cf9e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2659056

Change-Id: If53ddc3d07b99d55dc99584387f1c3f50d6fc043
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 15:46:54 +00:00
Alix Espino
87dd2019a0 Merge changes from topics "errProne_bp2build_manually_enabled", "error_prone_config" into main am: 2a779ea829 am: 77a01c4809
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2631710

Change-Id: I25b942822243d33a98ac43540bea3453a0fe39be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 15:00:32 +00:00
Treehugger Robot
e7ac56cf9e Merge "Log the command line to soong.log when soong_ui starts" into main am: 90d8f5514d am: 296e7ed439
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2659056

Change-Id: I25aab923dc3e273253f1a0ec975b0b6a345ad3c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 15:00:12 +00:00
Alix Espino
77a01c4809 Merge changes from topics "errProne_bp2build_manually_enabled", "error_prone_config" into main am: 2a779ea829
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2631710

Change-Id: Ifd9c2bc04a27072a3735ee777f09b50515ee4d01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 14:14:26 +00:00
Treehugger Robot
296e7ed439 Merge "Log the command line to soong.log when soong_ui starts" into main am: 90d8f5514d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2659056

Change-Id: Ia4494303157ef4b1d9fe2a68ead9982fd3dce33b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 14:13:43 +00:00
Alix Espino
2a779ea829 Merge changes from topics "errProne_bp2build_manually_enabled", "error_prone_config" into main
* changes:
  Bp2build for errorprone modules that manually enabled/disabled it
  Make errorprone a configurable attribute for bazel conversion
2023-07-17 13:54:50 +00:00
Treehugger Robot
90d8f5514d Merge "Log the command line to soong.log when soong_ui starts" into main 2023-07-17 13:23:17 +00:00
Alyssa Ketpreechasawat
0a528223c1 Merge "Fix the number of required parameters in deapexer script." into main am: 06ef4d954e am: ef542cd0af am: 24a63851ae
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658856

Change-Id: I6cb2ce4ef6cc7cc89ae87c7eeb034b4c2b9cd99f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 10:25:33 +00:00
Alyssa Ketpreechasawat
24a63851ae Merge "Fix the number of required parameters in deapexer script." into main am: 06ef4d954e am: ef542cd0af
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658856

Change-Id: I8e2806e9c26b6fa53ac51ebcd839b17ab98360b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 09:41:28 +00:00
Alyssa Ketpreechasawat
ef542cd0af Merge "Fix the number of required parameters in deapexer script." into main am: 06ef4d954e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658856

Change-Id: I7daf8e33091272b98e7a7d27bf05053c60603db1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-17 08:55:54 +00:00
Alyssa Ketpreechasawat
06ef4d954e Merge "Fix the number of required parameters in deapexer script." into main 2023-07-17 08:06:41 +00:00
Treehugger Robot
a3e9631cb8 Merge "Make pom2bp output preprocessed: true on app imports" into main am: 5473e0b0b7 am: a3278381d5 am: fdfd4c129a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657043

Change-Id: Iec57f8cd5da1f813fdfea5c18c6d20a3860073e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 05:37:39 +00:00
Treehugger Robot
fdfd4c129a Merge "Make pom2bp output preprocessed: true on app imports" into main am: 5473e0b0b7 am: a3278381d5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657043

Change-Id: If6a8bbe7b5ebfa36580ac91c447a5f47e8664c3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 04:51:32 +00:00
Treehugger Robot
a3278381d5 Merge "Make pom2bp output preprocessed: true on app imports" into main am: 5473e0b0b7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657043

Change-Id: I40859aef9e390fb7c3d402ee491d761ee30b3c5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15 03:38:55 +00:00
Treehugger Robot
5473e0b0b7 Merge "Make pom2bp output preprocessed: true on app imports" into main 2023-07-15 02:52:39 +00:00
Treehugger Robot
702837cb8e Merge "Turn off Global ThinLTO for LP32 again" into main am: 8eff85680c am: 32b9a99eb7 am: b08df6f54f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658818

Change-Id: I8450c062a9227917b9973373672b2b8d618f8a46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 23:52:57 +00:00
Treehugger Robot
9896606325 Merge "Revert "Enable sext.w removal for riscv targets"" into main am: 4cf52f17c5 am: bd2a555c0a am: e10c1ccbb2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657039

Change-Id: Ib65799359a549b1e4ee638af9d9bfc896e4dd829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 23:50:41 +00:00
Joe Onorato
010c6b67da Log the command line to soong.log when soong_ui starts
Change-Id: Ie39333e4771cddf4c828d5e3474e2e43001db807
Test: manual
2023-07-14 16:33:19 -07:00
Treehugger Robot
b08df6f54f Merge "Turn off Global ThinLTO for LP32 again" into main am: 8eff85680c am: 32b9a99eb7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658818

Change-Id: I7cde697fb8bd849b9781e03164aa016298037076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 23:03:23 +00:00
Treehugger Robot
e10c1ccbb2 Merge "Revert "Enable sext.w removal for riscv targets"" into main am: 4cf52f17c5 am: bd2a555c0a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657039

Change-Id: Ib81d1cec3767521c6895688554c839d5d0b965d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 23:03:08 +00:00
Cole Faust
1269a74fad Make pom2bp output preprocessed: true on app imports
The only difference between preprocessed + presigned vs just presigned
is that just presigned will zip align the apk, and preprocessed +
presigned will instead check that the apk is already aligned and has
uncompressed jni and dex libs. This should be the default to ensure
we're getting valid apk imports from external sources.

Presigned alone also won't work for apps with target sdk >= 30, because
on those target sdks you have to use apk signature v2, and having the
build system align the zip file will break that signature.

Bug: 185811447
Test: Presubmits
Change-Id: Ie825ab2eab4feeda5c266233a9dca7bbf9559be7
2023-07-14 15:44:24 -07:00
Treehugger Robot
32b9a99eb7 Merge "Turn off Global ThinLTO for LP32 again" into main am: 8eff85680c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658818

Change-Id: Ifea731ef45ae514a6ae15c3f7865e4f1744ffefb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 22:14:26 +00:00
Trevor Radcliffe
1c765f75f8 Merge "Update name of blocklist feature in bp2build" into main am: 3edec2151e am: 698a9bba8f am: af61f218cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2651201

Change-Id: Id85097f0d721731c56c4a6d2001cf0256324f2d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 22:14:12 +00:00
Treehugger Robot
bd2a555c0a Merge "Revert "Enable sext.w removal for riscv targets"" into main am: 4cf52f17c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657039

Change-Id: Ia8c6fd5f14a5f6aed103e41cbd8a102bd606b623
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 22:13:59 +00:00
Treehugger Robot
a3430ea813 Merge "Cleanup genrule_sandbox_test.py" into main am: b35cc91ba0 am: 79babae001 am: 5a05e5d8dc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2655343

Change-Id: Ibbeb51a466f82e01d548bc7db5a29076f8fe3001
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 22:13:59 +00:00
Treehugger Robot
8eff85680c Merge "Turn off Global ThinLTO for LP32 again" into main 2023-07-14 22:07:53 +00:00
Trevor Radcliffe
af61f218cf Merge "Update name of blocklist feature in bp2build" into main am: 3edec2151e am: 698a9bba8f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2651201

Change-Id: I019fddf14ae840b9061f60ac7b9aa5d6e8cacb3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 21:27:27 +00:00
Treehugger Robot
5a05e5d8dc Merge "Cleanup genrule_sandbox_test.py" into main am: b35cc91ba0 am: 79babae001
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2655343

Change-Id: I87a996a083da4851b7b165d1d87a89300c8b5449
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 21:26:37 +00:00
Treehugger Robot
4cf52f17c5 Merge "Revert "Enable sext.w removal for riscv targets"" into main 2023-07-14 20:59:25 +00:00
Trevor Radcliffe
698a9bba8f Merge "Update name of blocklist feature in bp2build" into main am: 3edec2151e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2651201

Change-Id: I271cf1c29d48207d179d423ef643318df0e88b3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 20:40:19 +00:00
Treehugger Robot
79babae001 Merge "Cleanup genrule_sandbox_test.py" into main am: b35cc91ba0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2655343

Change-Id: Iafb4f65b91a5cd275c0d02f8db9f3392424ac0fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 20:39:59 +00:00
Trevor Radcliffe
3edec2151e Merge "Update name of blocklist feature in bp2build" into main 2023-07-14 19:59:50 +00:00
Treehugger Robot
b35cc91ba0 Merge "Cleanup genrule_sandbox_test.py" into main 2023-07-14 19:50:23 +00:00
Spandan Das
f4a542cc00 Merge "Add missing formatting directive" into main am: e61a0817f6 am: 012c363b2b am: dc66ec3c65
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657400

Change-Id: I86df4902cfcfaf4ed9d1d345d656116523726999
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 18:46:35 +00:00
Spandan Das
d9c0a540f1 Merge "Cleanup an unused variable in rule_builder" into main am: 1181ca2be3 am: 6e2c437e1e am: d73f82aebd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657401

Change-Id: I003f39bbfdf9b9bf5592616f304a459276e66bbe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 18:46:24 +00:00
Colin Cross
9addd4b924 Merge "Revert "Use depsets for transitive manifests and assets"" into main am: 0a30ce7c4b am: 20d572b050 am: e5dcad264d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658795

Change-Id: I80111d814691b060266bafe094262fdb7f27a73b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 18:45:52 +00:00
Treehugger Robot
06acb0f889 Merge "Fix a typo. NFC." into main am: 59276876cd am: 4e0f3a19f3 am: 294e07f8de
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658057

Change-Id: I2bc36aae0818c1bd7ca9ddba9bef26a860d73801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 18:45:26 +00:00
Yi Kong
13beeedff7 Turn off Global ThinLTO for LP32 again
LP32 has many subtle issues and less test coverage.

Bug: 290859519
Bug: 169004486
Test: presubmit
Change-Id: I33fcf1a08b9e7a905ba81030250a9578532da5a0
2023-07-15 03:18:06 +09:00
Spandan Das
dc66ec3c65 Merge "Add missing formatting directive" into main am: e61a0817f6 am: 012c363b2b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657400

Change-Id: I2ff59356e1bf3c32825de01b8fe9e4e49a7e92d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 18:02:54 +00:00
Spandan Das
d73f82aebd Merge "Cleanup an unused variable in rule_builder" into main am: 1181ca2be3 am: 6e2c437e1e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657401

Change-Id: Id5034657f8b7445eb1e14e3700681ce6135cd24a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 18:02:40 +00:00
Colin Cross
e5dcad264d Merge "Revert "Use depsets for transitive manifests and assets"" into main am: 0a30ce7c4b am: 20d572b050
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658795

Change-Id: I471e7a0819043bcc22e1aa16ce33fcd62f404c84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 18:02:23 +00:00
Treehugger Robot
294e07f8de Merge "Fix a typo. NFC." into main am: 59276876cd am: 4e0f3a19f3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658057

Change-Id: I43d95e0eca366221da0681d163c08c9b60c49864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 18:02:07 +00:00
Alyssa Ketpreechasawat
ac6c853ee6 Fix the number of required parameters in deapexer script.
Regarding aosp/2624311, `blkid_path` was removed from the command, so the number of parameters should be reduced by 1.

Test: MODULE_BUILD_FROM_SOURCE=false m (in internal-main branch)
Bug: 279858383
Change-Id: Iad494b757e2a4152a6867098c3eb7419c3bba71b
2023-07-14 17:26:13 +00:00
Spandan Das
012c363b2b Merge "Add missing formatting directive" into main am: e61a0817f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657400

Change-Id: Ibf9039ffdfb422922d4429ac2335e2651e3ad129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 16:34:58 +00:00
Spandan Das
6e2c437e1e Merge "Cleanup an unused variable in rule_builder" into main am: 1181ca2be3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657401

Change-Id: Ia79d308e03787e4bab28c9da3520cff29db98cc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 16:34:24 +00:00
Spandan Das
e61a0817f6 Merge "Add missing formatting directive" into main 2023-07-14 16:24:05 +00:00
Spandan Das
1181ca2be3 Merge "Cleanup an unused variable in rule_builder" into main 2023-07-14 16:19:27 +00:00
Colin Cross
20d572b050 Merge "Revert "Use depsets for transitive manifests and assets"" into main am: 0a30ce7c4b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658795

Change-Id: I64ce1247270525779aeabb8471282abaa65eb904
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 16:13:30 +00:00
Treehugger Robot
4e0f3a19f3 Merge "Fix a typo. NFC." into main am: 59276876cd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658057

Change-Id: I75a9c33ea7ef1aef3133b376ba4737276bc44e37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14 16:13:16 +00:00