Commit Graph

67200 Commits

Author SHA1 Message Date
Cole Faust
b5edb1a0e4 Merge "Export non-apex variants of modules to make" am: bebe607db4 am: 09f4a08f55 am: 59a02182c0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486355

Change-Id: I2e614d603aea40bd1bacbda919e9ad1daf58f876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 19:04:28 +00:00
Cole Faust
59a02182c0 Merge "Export non-apex variants of modules to make" am: bebe607db4 am: 09f4a08f55
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486355

Change-Id: Ia1e8962fe04053aadf53c528f0dce5c09d680b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 18:27:57 +00:00
Cole Faust
09f4a08f55 Merge "Export non-apex variants of modules to make" am: bebe607db4
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486355

Change-Id: I0a6aa0332702b24c33e9db5ac85002781ba1bfa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 17:49:21 +00:00
Cole Faust
bebe607db4 Merge "Export non-apex variants of modules to make" 2023-03-17 17:20:19 +00:00
Usta (Tsering) Shrestha
d7d0e9832b Merge "python aprotoc instead of jq and textproto" am: 9741785c4c am: 631c5289cc am: 634611421a
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2435092

Change-Id: I61cf5ea31a8e5a3a3b767e90b2a41f172ae99950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 15:56:44 +00:00
Sam Delmerico
cdfbf10019 Merge "bp2build allowlist libimapper, bufferpools deps" am: 9ac38d7e4e am: f69d879621 am: e77830c49d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494315

Change-Id: I47e4786063f7bca47492693ec9702fdedf501ddd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 15:55:02 +00:00
Usta (Tsering) Shrestha
634611421a Merge "python aprotoc instead of jq and textproto" am: 9741785c4c am: 631c5289cc
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2435092

Change-Id: I09ad8d53e1899aced03f8032de068218018cb9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 15:19:55 +00:00
Sam Delmerico
e77830c49d Merge "bp2build allowlist libimapper, bufferpools deps" am: 9ac38d7e4e am: f69d879621
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494315

Change-Id: I54c3c38132775c886465f0a39ead27dbd7efcdc7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 15:18:49 +00:00
Usta (Tsering) Shrestha
631c5289cc Merge "python aprotoc instead of jq and textproto" am: 9741785c4c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2435092

Change-Id: Id3ff5803b910608baac97ebc4d2fa34093bfd54c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 14:43:26 +00:00
Sam Delmerico
f69d879621 Merge "bp2build allowlist libimapper, bufferpools deps" am: 9ac38d7e4e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494315

Change-Id: I22fc6b2f2e03163640fc00af825203dab7f75277
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 14:42:46 +00:00
Romain Jobredeaux
5923a576fb Merge "Create an intermediate java library for every java_binary target" am: d3d2be2636 am: e9cee4bcf0 am: 2552659d92
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494319

Change-Id: Ie3d807b9d160bc8a0712ccda3f788580747becf9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 14:24:20 +00:00
Usta (Tsering) Shrestha
9741785c4c Merge "python aprotoc instead of jq and textproto" 2023-03-17 14:13:18 +00:00
Sam Delmerico
9ac38d7e4e Merge "bp2build allowlist libimapper, bufferpools deps" 2023-03-17 14:07:29 +00:00
Romain Jobredeaux
2552659d92 Merge "Create an intermediate java library for every java_binary target" am: d3d2be2636 am: e9cee4bcf0
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494319

Change-Id: Ic2127af15ebb65de368fb84d09e1aae31fe4e0b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 13:46:39 +00:00
Romain Jobredeaux
e9cee4bcf0 Merge "Create an intermediate java library for every java_binary target" am: d3d2be2636
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2494319

Change-Id: I88f4ddba038ce33c54d58ebf97792d12726dae3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-17 13:11:50 +00:00
Romain Jobredeaux
d3d2be2636 Merge "Create an intermediate java library for every java_binary target" 2023-03-17 12:30:15 +00:00
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
Usta Shrestha
47541bb1cf python aprotoc instead of jq and textproto
Bug: 273996308
Test: incremental_build.sh -c clean
Change-Id: I5b6c32667003010ccac5d3a46ac888f26788b3c5
2023-03-16 21:28:21 +00:00
Romain Jobredeaux
f5f6073ff5 Create an intermediate java library for every java_binary target
We're already doing this for kotlin libraries as java_binary does not
support kotlin sources.

Change-Id: I4967b3aca21dac8e0eaf54d48cc35d57a4c4923e
2023-03-16 21:11:30 +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
Sam Delmerico
9d71a84e55 bp2build allowlist libimapper, bufferpools deps
These are used to build com.android.neuralnetworks and
com.android.media.swcodec.

Bug: 273927900
Test: b build --config=android //frameworks/av/apex:com.android.media.swcodec
Test: b build --config=android
  //packages/modules/NeuralNetworks/apex:com.android.neuralnetworks
Change-Id: Ia36d6e3419fb5034f1dbf410da738fcbf98d6874
2023-03-16 16:55:47 -04: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