Commit Graph

67180 Commits

Author SHA1 Message Date
Jingwen Chen
e2680b51f2 Merge "Populate apexBundle#filesInfo using bazel info." am: bb37c196a3 am: 21a852f8df am: 98661ab60b
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486498

Change-Id: If551cb9d523b1f055875065170add06189410214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 08:28:02 +00:00
Jingwen Chen
98661ab60b Merge "Populate apexBundle#filesInfo using bazel info." am: bb37c196a3 am: 21a852f8df
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486498

Change-Id: Ic2111a181cc2470f5daf6a2afad48238475c0dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 07:51:12 +00:00
Jingwen Chen
21a852f8df Merge "Populate apexBundle#filesInfo using bazel info." am: bb37c196a3
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486498

Change-Id: Ibc552d07ee2f910884111fd9daa5d48662e80ba6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 07:16:10 +00:00
Wei Li
48b1cb76fa Merge "Build partition images and SBOM seperately in case the build of SBOM introduces extra dependencies that included in partition images." am: b67dbb23c5 am: 478895321f am: 1db5a5b00e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494280

Change-Id: I67457dbad8323a852284c17e6f4d9d76b1e7cdb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 07:15:40 +00:00
Jingwen Chen
bb37c196a3 Merge "Populate apexBundle#filesInfo using bazel info." 2023-03-17 06:42:04 +00:00
Wei Li
1db5a5b00e Merge "Build partition images and SBOM seperately in case the build of SBOM introduces extra dependencies that included in partition images." am: b67dbb23c5 am: 478895321f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494280

Change-Id: Iba276bf96fbf0bb19d0b2ee84c215cc3a7a3ba4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 06:39:00 +00:00
Wei Li
478895321f Merge "Build partition images and SBOM seperately in case the build of SBOM introduces extra dependencies that included in partition images." am: b67dbb23c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494280

Change-Id: I70a5da21fcf58fd6e28c0f905102166b4cb9eeb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 06:03:29 +00:00
Wei Li
b67dbb23c5 Merge "Build partition images and SBOM seperately in case the build of SBOM introduces extra dependencies that included in partition images." 2023-03-17 05:24:56 +00:00
Prashanth Swaminathan
457731330e Merge "Enable VNDK when version matches platform VNDK" am: bdc99964cf am: 5192fdd8f6 am: aa5993f5fd
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2464669

Change-Id: Id8d8ca0f915b409ba64b73a5d6e339f33f2b99df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 03:56:01 +00:00
Treehugger Robot
1eb34bc0e3 Merge "minor refactor ui/build/ninja.go" am: f77df19cb8 am: f4709bf419 am: 58bf9935c7
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494675

Change-Id: I1701323f3eacc91c0495f5ee6626037e5d476cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 03:50:38 +00:00
Prashanth Swaminathan
aa5993f5fd Merge "Enable VNDK when version matches platform VNDK" am: bdc99964cf am: 5192fdd8f6
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2464669

Change-Id: If2b02e548bd3f9d155b872641867bbe83df14024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 03:14:44 +00:00
Treehugger Robot
58bf9935c7 Merge "minor refactor ui/build/ninja.go" am: f77df19cb8 am: f4709bf419
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494675

Change-Id: Id4fde9d08a641a4020483708cbb0b8a79f6a67f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 03:13:39 +00:00
Prashanth Swaminathan
5192fdd8f6 Merge "Enable VNDK when version matches platform VNDK" am: bdc99964cf
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2464669

Change-Id: I8db8063e7994f1ec8f703d1432bec0e0ac44b30c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 02:55:34 +00:00
Prashanth Swaminathan
bdc99964cf Merge "Enable VNDK when version matches platform VNDK" 2023-03-17 02:46:00 +00:00
Treehugger Robot
f4709bf419 Merge "minor refactor ui/build/ninja.go" am: f77df19cb8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494675

Change-Id: Ifbedc9f7cd94e4984c8d5122ab96a2438ac0b8aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 02:37:42 +00:00
Treehugger Robot
f77df19cb8 Merge "minor refactor ui/build/ninja.go" 2023-03-17 02:07:51 +00:00
Treehugger Robot
25f9bf8d88 Merge "Fix the make name of rust snapshots" am: 9433998d9a am: 88cd3710ee am: 3d6e389e11
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2490756

Change-Id: I57284d429f736bdade9affea75e03f644491142c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 01:59:17 +00:00
Treehugger Robot
3d6e389e11 Merge "Fix the make name of rust snapshots" am: 9433998d9a am: 88cd3710ee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2490756

Change-Id: I9e578baf2bd04ab83938fe2043c46826fb77a09d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 01:23:04 +00:00
Treehugger Robot
88cd3710ee Merge "Fix the make name of rust snapshots" am: 9433998d9a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2490756

Change-Id: I03c1fdc4688d96711fccd4e8308435ed7307a4c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 00:45:38 +00:00
Treehugger Robot
9433998d9a Merge "Fix the make name of rust snapshots" 2023-03-17 00:13:50 +00:00
Wei Li
898918f7c8 Build partition images and SBOM seperately in case the build of SBOM introduces extra dependencies that included in partition images.
Bug: 272358980
Test: build/soong/tests/sbom_test.sh
Test: CIs
Change-Id: I99bd2357344f9a3d5827cf052b69e3e8545241c0
2023-03-16 22:52:35 +00:00
Treehugger Robot
a46dadb2e1 Merge "Rename mk2rbc/cmd to make go install work properly" am: 65e42ecd47 am: 653cd66d03 am: a23a0a709f
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2491117

Change-Id: Id7f7462c471c3fc93df1f5ae0a2fc7c79f0eab5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 21:38:27 +00:00
Treehugger Robot
a23a0a709f Merge "Rename mk2rbc/cmd to make go install work properly" am: 65e42ecd47 am: 653cd66d03
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2491117

Change-Id: Id720b552932a2ec753e121a2df43e0870fdb529e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:58:51 +00:00
Treehugger Robot
653cd66d03 Merge "Rename mk2rbc/cmd to make go install work properly" am: 65e42ecd47
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2491117

Change-Id: Ifde8648b091f3532536e96b386e004666fe4a92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 20:40:28 +00:00
Treehugger Robot
65e42ecd47 Merge "Rename mk2rbc/cmd to make go install work properly" 2023-03-16 20:26:22 +00:00
Wei Li
581d0a2d11 Merge "Revert "Revert "Revert "Revert "Add integration test for testing generat...""" am: 44ac6dad27 am: 7b1742f170 am: b9b01edb82
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2490498

Change-Id: I87c7793f92eaa77ba9f30aa81b2efb88b8714b8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 19:59:52 +00:00
Wei Li
b9b01edb82 Merge "Revert "Revert "Revert "Revert "Add integration test for testing generat...""" am: 44ac6dad27 am: 7b1742f170
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2490498

Change-Id: Idb23c10bccbeb1065cf25d840b21f44bbd40e55d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 19:21:00 +00:00
Sam Delmerico
d08f47deea Merge "remove stub dependency on source_library" am: c02e7d4017 am: 5bb9edc700 am: a6fb5bf582
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2492376

Change-Id: I263e6ba5bd72946dcde262055bb580ad9a1b05f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 19:01:14 +00:00
Spandan Das
e6bfdbf825 Merge "NDK ABI diffs requires implementation" am: 046bb4b08a am: 54a38c029d am: 7468d64aa1
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2488215

Change-Id: Ie0c6d2ede12a61bad8482b0418962364f0b6e56d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 19:00:59 +00:00
Wei Li
7b1742f170 Merge "Revert "Revert "Revert "Revert "Add integration test for testing generat...""" am: 44ac6dad27
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2490498

Change-Id: Ie31956551e329fa6e03423da6c59f02b12aff14f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 18:40:16 +00:00
Wei Li
44ac6dad27 Merge "Revert "Revert "Revert "Revert "Add integration test for testing generat...""" 2023-03-16 18:20:48 +00:00
Sam Delmerico
a6fb5bf582 Merge "remove stub dependency on source_library" am: c02e7d4017 am: 5bb9edc700
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2492376

Change-Id: I681c01642015e070c92439897f2b40742e8784a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 18:20:43 +00:00
Spandan Das
7468d64aa1 Merge "NDK ABI diffs requires implementation" am: 046bb4b08a am: 54a38c029d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2488215

Change-Id: I17a6b628954c7c2a9824e00b55d168d0cc08c3ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 18:19:45 +00:00
Jingwen Chen
2d37b641c5 Populate apexBundle#filesInfo using bazel info.
This CL adds a few things:

1) Populate the filesInfo struct with cquery'd information from an
apex's ApexMkInfo provider. This filesInfo is then used in
apex/androidmk.go to generate Make modules (soong_cc_rust_prebuilt.mk),
which are then used in packaging to generate zip files of symbols in $PRODUCT_OUT.
2) Make a list of dicts of primitives JSON-encodable.
3) Tests.

Bug: 271423316
Bug: 271423062
Test: presubmits
Change-Id: Iaa34f51044de310510e580d9cf1fe60bbef801c1
2023-03-16 18:09:27 +00:00
Sam Delmerico
5bb9edc700 Merge "remove stub dependency on source_library" am: c02e7d4017
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2492376

Change-Id: Icf8945a946c7f8c27ce02510dade3d25a6be1a12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 18:01:38 +00:00
Sam Delmerico
c02e7d4017 Merge "remove stub dependency on source_library" 2023-03-16 17:43:11 +00:00
Spandan Das
54a38c029d Merge "NDK ABI diffs requires implementation" am: 046bb4b08a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2488215

Change-Id: I6a08f23e1f96c7d861bb8fe9c1b170873f7cbb91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 17:40:03 +00:00
Nicolas Geoffray
7471b92542 Merge "Revert^2 "Generate a boot image extension for mainline BCP..." am: addd60c430 am: 952b720b66 am: eabac6f206
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470961

Change-Id: I1793e512d95a85d5f0b14d6394aae7770c5d2841
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 17:21:15 +00:00
Treehugger Robot
50e59d2e09 Merge "make tidy attribute tri-state" am: feeee3ad26 am: ea07415c6d am: 2f6810bee8
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2484857

Change-Id: I207beb45b9a7fd506f361b8fb2777d64a3225824
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 17:20:52 +00:00
Spandan Das
046bb4b08a Merge "NDK ABI diffs requires implementation" 2023-03-16 17:02:04 +00:00
Jeongik Cha
96d6227999 minor refactor ui/build/ninja.go
1. extract .ninja_log as const
2. log an error during reading .ninja_log

Test: m nothing
Bug: 271527305
Change-Id: I395dd8419620bfa9fad3af23c96e5a22ca44e2fb
2023-03-17 01:53:11 +09:00
Nicolas Geoffray
eabac6f206 Merge "Revert^2 "Generate a boot image extension for mainline BCP..." am: addd60c430 am: 952b720b66
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470961

Change-Id: I15fb5ca9acf81324334b403141249035132ba29b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 16:44:47 +00:00
Treehugger Robot
2f6810bee8 Merge "make tidy attribute tri-state" am: feeee3ad26 am: ea07415c6d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2484857

Change-Id: Ib645e8184d8103615486858f994b0b9b79a14906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 16:44:27 +00:00
David Duarte
3f0a27fcda Merge changes from topic "cherrypicker-L79900000959159899:N92500001348066145" into udc-dev
* changes:
  [automerged blank] Make ‘rustfmt.toml’ available for other modules 2p: 15fc229438
  Make ‘rustfmt.toml’ available for other modules
2023-03-16 16:27:39 +00:00
Jeongik Cha
2b7bd03aba Add --ninja_weight_source option am: 0cf44d5e8d am: 1743abb88e am: fdb5ff8c33
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486497

Change-Id: If6fe5a68f6bf795a477df6ae39b810812f33afdd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 16:26:07 +00:00
Jeongik Cha
04503310bd Add time unit for CriticalPathInfo's fields' name am: 767ce714bb am: 01aad1514e am: 0f0c64e527
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2489776

Change-Id: I97f1232ac37bbc968fbd5e3432f64b664a52e217
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 16:26:03 +00:00
Nicolas Geoffray
952b720b66 Merge "Revert^2 "Generate a boot image extension for mainline BCP..." am: addd60c430
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2470961

Change-Id: Ib6222730216bdca27ef31cd9c78066054f4095ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 16:10:20 +00:00
Treehugger Robot
ea07415c6d Merge "make tidy attribute tri-state" am: feeee3ad26
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2484857

Change-Id: Id71ff4839ce8363db99cdc7d38c62c14e69ca95c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 16:08:14 +00:00
Nicolas Geoffray
addd60c430 Merge "Revert^2 "Generate a boot image extension for mainline BCP..." 2023-03-16 16:07:45 +00:00
Jeongik Cha
fdb5ff8c33 Add --ninja_weight_source option am: 0cf44d5e8d am: 1743abb88e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486497

Change-Id: I0576513cb58a547fd1f1a76ebd38818455dc311a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 15:49:57 +00:00