Commit Graph

74105 Commits

Author SHA1 Message Date
Romain Jobredeaux
7788da47a1 Merge "Re-order android_app bp2build converter logic." into main am: 2195f24ec4 am: 80a3c08c0c am: 0b02d44081 am: 935c1b559f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744723

Change-Id: Id3aa31a34e42bcc491c92cd852c471c89752794b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 16:52:06 +00:00
Romain Jobredeaux
935c1b559f Merge "Re-order android_app bp2build converter logic." into main am: 2195f24ec4 am: 80a3c08c0c am: 0b02d44081
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744723

Change-Id: Iff9f8244e307f4c0a05a68c860c31f5f935057b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 16:13:55 +00:00
Romain Jobredeaux
0b02d44081 Merge "Re-order android_app bp2build converter logic." into main am: 2195f24ec4 am: 80a3c08c0c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744723

Change-Id: I15b9f9c8674bda690ebb7a86ddbc281d978b415d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 15:25:58 +00:00
Romain Jobredeaux
80a3c08c0c Merge "Re-order android_app bp2build converter logic." into main am: 2195f24ec4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2744723

Change-Id: I9415e5badd071725187936d3b5f11243e27fbb15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 14:32:34 +00:00
Romain Jobredeaux
2195f24ec4 Merge "Re-order android_app bp2build converter logic." into main 2023-09-12 13:56:00 +00:00
Treehugger Robot
d333324251 Merge "Allowlist packages instead of modules" into main am: 0e3da8162c am: 684cdf8a49 am: fcbdddd404 am: e35ea9fd3a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747533

Change-Id: If8e6fa988051ec4281e25deddc8166e759237a50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 04:34:16 +00:00
Treehugger Robot
d784c98051 Merge changes from topic "aidl_interface_hdrs" into main am: 7db882793b am: b3b682c911 am: d5c3470d2d am: b52f4c681c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734380

Change-Id: Ie19cbf24f5d44499e33472b329de205842a38b19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 04:33:56 +00:00
Jooyung Han
c94ed3a696 Merge changes from topics "fix-apex-linkerconfig", "fix-apex-vintf" into main am: fc7ba26f1c am: 6fb6ccd5a2 am: c5a20552ea am: 8f0939d066
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745100

Change-Id: Idaaa0a2a148d9d15ac089e905d3cf6cf67291686
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 04:33:35 +00:00
Treehugger Robot
e35ea9fd3a Merge "Allowlist packages instead of modules" into main am: 0e3da8162c am: 684cdf8a49 am: fcbdddd404
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747533

Change-Id: I68e70d6ca2552ec2d964b99b494f54171fe427a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 03:56:58 +00:00
Treehugger Robot
b52f4c681c Merge changes from topic "aidl_interface_hdrs" into main am: 7db882793b am: b3b682c911 am: d5c3470d2d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734380

Change-Id: I081aeaf6c3a8e62ea85ecf3a8717f358fdb99f62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 03:56:38 +00:00
Jooyung Han
8f0939d066 Merge changes from topics "fix-apex-linkerconfig", "fix-apex-vintf" into main am: fc7ba26f1c am: 6fb6ccd5a2 am: c5a20552ea
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745100

Change-Id: I571b29d809000c07be4ced1cab8cc60f103285a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 03:56:16 +00:00
Treehugger Robot
fcbdddd404 Merge "Allowlist packages instead of modules" into main am: 0e3da8162c am: 684cdf8a49
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747533

Change-Id: I78c8d469213ec530976b9189cc10f443dbc327ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 03:06:42 +00:00
Treehugger Robot
d5c3470d2d Merge changes from topic "aidl_interface_hdrs" into main am: 7db882793b am: b3b682c911
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734380

Change-Id: I25bcbf8f89cdfe7d8e0e41ab05312e7ac1c4cb6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 03:06:23 +00:00
Jooyung Han
c5a20552ea Merge changes from topics "fix-apex-linkerconfig", "fix-apex-vintf" into main am: fc7ba26f1c am: 6fb6ccd5a2
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745100

Change-Id: I9ac6b120bd3acf22ebf19a31449159d2aa1cd6aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 03:05:46 +00:00
Treehugger Robot
684cdf8a49 Merge "Allowlist packages instead of modules" into main am: 0e3da8162c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747533

Change-Id: I29f570158b77e6623909c76464f80631236e0b48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 02:14:10 +00:00
Treehugger Robot
b3b682c911 Merge changes from topic "aidl_interface_hdrs" into main am: 7db882793b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2734380

Change-Id: I218ea1e982cce0b07d67d6b5017ffe9417af0246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 02:13:44 +00:00
Jooyung Han
6fb6ccd5a2 Merge changes from topics "fix-apex-linkerconfig", "fix-apex-vintf" into main am: fc7ba26f1c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2745100

Change-Id: I0459dd6821213d80abce039a4ec417363fac22f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 02:12:53 +00:00
Treehugger Robot
0e3da8162c Merge "Allowlist packages instead of modules" into main 2023-09-12 01:53:49 +00:00
Treehugger Robot
7db882793b Merge changes from topic "aidl_interface_hdrs" into main
* changes:
  export SimpleModuleDoNotConvertBp2build for AIDL
  export SetStubsForDynamicDeps for use in AIDL
2023-09-12 01:52:03 +00:00
Jooyung Han
fc7ba26f1c Merge changes from topics "fix-apex-linkerconfig", "fix-apex-vintf" into main
* changes:
  apex: validate vintf fragments in vendor APEX
  apex: invoke `conv_linker_config validate` as validation
2023-09-12 01:39:07 +00:00
Zi Wang
4a8d29f8bb Merge "Allowlist libprotobuf-java-full" into main am: 37aa1729b0 am: 28907d4680 am: 9b4837bddf am: b7cf526f77
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746115

Change-Id: I1de6d1d968289a042197d44dda43b67a20674374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 01:15:38 +00:00
Treehugger Robot
82690aedf0 Merge "Revert "rustc-1.72.0 Build 10752340"" into main am: e79010c7ca am: c2ee8dc093 am: ed48777d01 am: 5d9dc16eb1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747146

Change-Id: I1d81b0fbd232e27080c2b5e00b50f26c53691ef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 01:15:03 +00:00
Zi Wang
b7cf526f77 Merge "Allowlist libprotobuf-java-full" into main am: 37aa1729b0 am: 28907d4680 am: 9b4837bddf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746115

Change-Id: Icbbda6049794c1bf4a6b55917089c01f1cf9145b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 00:39:55 +00:00
Treehugger Robot
5d9dc16eb1 Merge "Revert "rustc-1.72.0 Build 10752340"" into main am: e79010c7ca am: c2ee8dc093 am: ed48777d01
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747146

Change-Id: Idb1127659bde991604340511a5ce0abda9f9b514
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-12 00:39:31 +00:00
Zi Wang
9b4837bddf Merge "Allowlist libprotobuf-java-full" into main am: 37aa1729b0 am: 28907d4680
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746115

Change-Id: I57c1d7f56fc628d84057339dc1001bf861735074
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 23:51:10 +00:00
Treehugger Robot
ed48777d01 Merge "Revert "rustc-1.72.0 Build 10752340"" into main am: e79010c7ca am: c2ee8dc093
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747146

Change-Id: Ie68ad1a8032ab337b53ef44cfb54d8e8d8bb56ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 23:50:47 +00:00
Zi Wang
28907d4680 Merge "Allowlist libprotobuf-java-full" into main am: 37aa1729b0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746115

Change-Id: I5a8d551d5f39932cbe9d44088d5bb75294019f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 22:59:44 +00:00
Treehugger Robot
c2ee8dc093 Merge "Revert "rustc-1.72.0 Build 10752340"" into main am: e79010c7ca
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747146

Change-Id: I70a48acfac4e5c757c308837f545a88e53810b99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 22:58:30 +00:00
Zi Wang
37aa1729b0 Merge "Allowlist libprotobuf-java-full" into main 2023-09-11 22:50:40 +00:00
Treehugger Robot
e79010c7ca Merge "Revert "rustc-1.72.0 Build 10752340"" into main 2023-09-11 22:29:04 +00:00
Vinh Tran
9226051310 Allowlist packages instead of modules
bp2build doesn't support allowlisting fully qualified module names. Hence, when modules such as libui and libbinder have duplicate names with corresponding fdo_profile modules, bp2build yields an error. See b/299663210 for more context.

Test: CI
Bug: 299663210
Change-Id: Ic175f5aea38139d34c5df8b9d02e7d82d9b3fc10
2023-09-11 18:15:35 -04:00
Romain Jobredeaux
d2cc5037c2 Re-order android_app bp2build converter logic.
This change is a no-op but makes it easier to single out framework-res
for conversion in subsequent CL aosp/2720593.

Bug: 276928228
Test: CI
Change-Id: I7c7338add1857697912dec3c34b7c43e06d2d12d
2023-09-11 16:37:50 -04:00
Treehugger Robot
ccf4891ea2 Merge "rustc-1.72.0 Build 10752340" into main am: d15dcb7158 am: d1d890d94b am: 353f11f753 am: 7ec9c397e3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736851

Change-Id: I50daccd8efb11e959d48f71b496d9aebe194d9a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:32:38 +00:00
Treehugger Robot
bf335ffb32 Merge "Remove link to internal doc in Soong AOSP README." into main am: 3d4e1eaa3f am: a833ddf80e am: 017d82f2f1 am: b41cec8088
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747473

Change-Id: I0e5d50616cfa5435f940b013c769f341420a187f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:30:45 +00:00
Cole Faust
ca9e576597 Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: 7a05d1392a am: acb8ca12a0 am: 937ae76394 am: 6732deca4b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746357

Change-Id: Ib72035a362e77f28eaff1db1883b92b2d6e832a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 20:25:08 +00:00
James Farrell
5d4be57cac Revert "rustc-1.72.0 Build 10752340"
Revert submission 2736851-rust-1.72

Reason for revert: Breaks Mac builds

Change-Id: I94a30e61f9f717ad135fbef7ec7241730f583110
2023-09-11 20:01:49 +00:00
Treehugger Robot
7ec9c397e3 Merge "rustc-1.72.0 Build 10752340" into main am: d15dcb7158 am: d1d890d94b am: 353f11f753
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736851

Change-Id: Id2a8d32f5241fb12c326d38e086eeafae236273c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:54:51 +00:00
Treehugger Robot
b41cec8088 Merge "Remove link to internal doc in Soong AOSP README." into main am: 3d4e1eaa3f am: a833ddf80e am: 017d82f2f1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747473

Change-Id: I9a4dbc625e50a1fb12b4d3e5893c39c4ee52fb02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:53:49 +00:00
Cole Faust
6732deca4b Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: 7a05d1392a am: acb8ca12a0 am: 937ae76394
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746357

Change-Id: I11eb69499835cac1f3311887ced05e6c3b43917e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:47:43 +00:00
Treehugger Robot
353f11f753 Merge "rustc-1.72.0 Build 10752340" into main am: d15dcb7158 am: d1d890d94b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736851

Change-Id: I455ea25023737823051090d4bb95ab5afc0bb1df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:01:27 +00:00
Treehugger Robot
017d82f2f1 Merge "Remove link to internal doc in Soong AOSP README." into main am: 3d4e1eaa3f am: a833ddf80e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747473

Change-Id: If705d10544cbad6c770202cedde91ee9cb294bce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 19:00:53 +00:00
Cole Faust
937ae76394 Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: 7a05d1392a am: acb8ca12a0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746357

Change-Id: Icfd6c48dbc0d4910b511939ba62ab5f6de8ef652
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:59:19 +00:00
Treehugger Robot
d1d890d94b Merge "rustc-1.72.0 Build 10752340" into main am: d15dcb7158
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2736851

Change-Id: Idcf5de901e38f64f3022faa0174c4255c645583f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:55:23 +00:00
Treehugger Robot
d15dcb7158 Merge "rustc-1.72.0 Build 10752340" into main 2023-09-11 18:20:20 +00:00
Treehugger Robot
a833ddf80e Merge "Remove link to internal doc in Soong AOSP README." into main am: 3d4e1eaa3f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2747473

Change-Id: Id7a96f66f7a132c5b53ff92193f8d645bc9cabed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:08:11 +00:00
Cole Faust
acb8ca12a0 Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: 7a05d1392a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2746357

Change-Id: I6efc7cf9adabf83c9e0d86d49b56f7db73ec763f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-11 18:07:51 +00:00
Treehugger Robot
3d4e1eaa3f Merge "Remove link to internal doc in Soong AOSP README." into main 2023-09-11 17:41:21 +00:00
Cole Faust
7a05d1392a Merge "Allow actions to read BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main 2023-09-11 17:25:18 +00:00
Jingwen Chen
fcf8a46385 Remove link to internal doc in Soong AOSP README.
Test: n/a
Change-Id: Ic0a997938a5dc4fbb46f401daa3cb3f6e8c2c54b
2023-09-11 08:24:23 +00:00
Sam Delmerico
130d75b6b3 export SimpleModuleDoNotConvertBp2build for AIDL
Bug: 298246873
Change-Id: I06ed7bb8fc1139731a2b48440a91aeb7f383efff
2023-09-10 19:05:54 +00:00