Colin Cross
e699b48df5
Merge changes Ied0a6cfe,I8c025efe into main am: adb892c539
am: d4875a4ae6
am: 4bc82d4f82
am: 52b380f33a
am: 41fe9dc4fd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658796
Change-Id: I935488792818808bc80b143adaefd958fd1ee2c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 22:14:29 +00:00
Colin Cross
e3741d1204
[automerger skipped] Install sdk variants in unbundled builds and package uninstallable variants am: 3d6f3a02f8
am: 9ab0aa0b33
-s ours
...
am skip reason: Merged-In If5418df3ddbb940bd631caebdf38daa81e71f40e with SHA-1 bd3a16b5e7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24086298
Change-Id: Ib8f9e0d495ef0c89df6f300f974d1033ce6e6cd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 22:08:41 +00:00
Alix Espino
53a9c4fddd
Merge changes from topics "errProne_bp2build_manually_enabled", "error_prone_config" into main am: 2a779ea829
am: 77a01c4809
am: 87dd2019a0
am: dff03221fa
am: aa3cf2cba9
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2631710
Change-Id: I813148bfb7f85aaa52e0fc29a0ac1b0892091387
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 21:47:18 +00:00
Colin Cross
9ab0aa0b33
Install sdk variants in unbundled builds and package uninstallable variants am: 3d6f3a02f8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/24086298
Change-Id: I9a32c851e0ece8866d0f5bbd515674ffba1be152
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 21:25:21 +00:00
Colin Cross
41fe9dc4fd
Merge changes Ied0a6cfe,I8c025efe into main am: adb892c539
am: d4875a4ae6
am: 4bc82d4f82
am: 52b380f33a
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658796
Change-Id: I302aed609593e4169ad566cddc65a8a300ace899
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 19:26:42 +00:00
Colin Cross
52b380f33a
Merge changes Ied0a6cfe,I8c025efe into main am: adb892c539
am: d4875a4ae6
am: 4bc82d4f82
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658796
Change-Id: I6857a0ca250f222082c925920d65aa574cec4154
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 18:44:56 +00:00
Colin Cross
4bc82d4f82
Merge changes Ied0a6cfe,I8c025efe into main am: adb892c539
am: d4875a4ae6
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658796
Change-Id: I884bee8d52f19a6ccadad39eedd0d0237b04e65a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 18:01:46 +00:00
Treehugger Robot
12330f0138
Merge "Log the command line to soong.log when soong_ui starts" into main am: 90d8f5514d
am: 296e7ed439
am: e7ac56cf9e
am: 9c0cf2cecd
am: 37e84426ae
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2659056
Change-Id: Id095aebb2202b797da0e556a572980f1e4ec60b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 17:31:33 +00:00
Colin Cross
d4875a4ae6
Merge changes Ied0a6cfe,I8c025efe into main am: adb892c539
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658796
Change-Id: Iaa8bd9ce181b6bb6375209b25d6930484fd7da13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 17:16:04 +00:00
Alix Espino
aa3cf2cba9
Merge changes from topics "errProne_bp2build_manually_enabled", "error_prone_config" into main am: 2a779ea829
am: 77a01c4809
am: 87dd2019a0
am: dff03221fa
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2631710
Change-Id: I2d167f1b5fdf7d7b6f60b0da3f11946824bad733
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 16:48:05 +00:00
Treehugger Robot
37e84426ae
Merge "Log the command line to soong.log when soong_ui starts" into main am: 90d8f5514d
am: 296e7ed439
am: e7ac56cf9e
am: 9c0cf2cecd
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2659056
Change-Id: If9d97bbea92821b293ee2d37c6c5f3f4e464e872
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 16:47:46 +00:00
Colin Cross
adb892c539
Merge changes Ied0a6cfe,I8c025efe into main
...
* changes:
Reland: Use depsets for transitive manifests and assets
Add test for manifest merger
2023-07-17 16:30:55 +00:00
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
739b3b23fa
Merge "Fix the number of required parameters in deapexer script." into main am: 06ef4d954e
am: ef542cd0af
am: 24a63851ae
am: 0a528223c1
am: 8cc39218fb
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658856
Change-Id: I48151cf88d443736423305ae2da3c6bcbb1ad258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 11:52:38 +00:00
Alyssa Ketpreechasawat
8cc39218fb
Merge "Fix the number of required parameters in deapexer script." into main am: 06ef4d954e
am: ef542cd0af
am: 24a63851ae
am: 0a528223c1
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658856
Change-Id: I032638b22dbb763c09cb2a185855a186fbaf149c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-17 11:08:42 +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
8ec1e2f628
Merge "Make pom2bp output preprocessed: true on app imports" into main am: 5473e0b0b7
am: a3278381d5
am: fdfd4c129a
am: a3e9631cb8
am: 482b6b6987
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657043
Change-Id: I6eeb2d6490f633149d3e42273416e372ea7c2f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 07:06:15 +00:00
Treehugger Robot
482b6b6987
Merge "Make pom2bp output preprocessed: true on app imports" into main am: 5473e0b0b7
am: a3278381d5
am: fdfd4c129a
am: a3e9631cb8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657043
Change-Id: I8682b15a902b32cc8469d8fca85b9ff2731784e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 06:18:19 +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
6be485ce32
Merge "Turn off Global ThinLTO for LP32 again" into main am: 8eff85680c
am: 32b9a99eb7
am: b08df6f54f
am: 702837cb8e
am: 476af94b01
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658818
Change-Id: I9b193ff7880c53f4a8b9f77e0e5866ac6fafb8fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 01:19:27 +00:00
Treehugger Robot
4e93bf93da
Merge "Revert "Enable sext.w removal for riscv targets"" into main am: 4cf52f17c5
am: bd2a555c0a
am: e10c1ccbb2
am: 9896606325
am: 8382e351ee
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657039
Change-Id: Id8c8a300a0ae3433f1ea62a93cae4382aba71d50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 01:17:36 +00:00
Treehugger Robot
476af94b01
Merge "Turn off Global ThinLTO for LP32 again" into main am: 8eff85680c
am: 32b9a99eb7
am: b08df6f54f
am: 702837cb8e
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2658818
Change-Id: Idaa28b2cf696f9348a46249f50484db1da7bc7db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 00:37:09 +00:00
Treehugger Robot
8382e351ee
Merge "Revert "Enable sext.w removal for riscv targets"" into main am: 4cf52f17c5
am: bd2a555c0a
am: e10c1ccbb2
am: 9896606325
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2657039
Change-Id: I7549558706471e4b3047ace019bc09b838e686c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 00:36:16 +00:00
Trevor Radcliffe
e981959888
Merge "Update name of blocklist feature in bp2build" into main am: 3edec2151e
am: 698a9bba8f
am: af61f218cf
am: 1c765f75f8
am: 223a44f2ae
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2651201
Change-Id: If78abd66f6a831cd13d4a8f3780de234a46942c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 00:01:18 +00:00
Treehugger Robot
df3407555a
Merge "Cleanup genrule_sandbox_test.py" into main am: b35cc91ba0
am: 79babae001
am: 5a05e5d8dc
am: a3430ea813
am: 27298c4577
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2655343
Change-Id: Id7be78155f46be60604ded5437aa5bd18a4fe05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-15 00:01:02 +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
Trevor Radcliffe
223a44f2ae
Merge "Update name of blocklist feature in bp2build" into main am: 3edec2151e
am: 698a9bba8f
am: af61f218cf
am: 1c765f75f8
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2651201
Change-Id: I865e05fb26b8b4c233be4f8b7a5d00ff3b9e1a16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 23:03:06 +00:00
Treehugger Robot
27298c4577
Merge "Cleanup genrule_sandbox_test.py" into main am: b35cc91ba0
am: 79babae001
am: 5a05e5d8dc
am: a3430ea813
...
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2655343
Change-Id: I2a333c6bd3af7abe90c6714ca55f81b6651815b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-07-14 23:02:51 +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