Commit Graph

64003 Commits

Author SHA1 Message Date
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
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
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
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
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
Jingwen Chen
bb37c196a3 Merge "Populate apexBundle#filesInfo using bazel info." 2023-03-17 06:42:04 +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
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
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
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
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
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
Cole Faust
502da3987a Export non-apex variants of modules to make
Currently, non-apex variants of modules that are in apexes are not
exported to make unless they're apex_available to the platform. This
means that you can't `m` those modules directly.

However, there is a workaround in the apex androidmk implementation that
emits make rules for the removed modules, but just redirects them to
build the apex itself. We want to remove that, but one of the problems
with doing so is that you can no longer `m` many modules afterwards.

To fix that, unhide the apex's dependencies from make. To ensure they're
not installed, call SkipInstall() on them, and update SkipInstall() to
be more strict by setting `LOCAL_UNINSTALLABLE_MODULE := true`.

Bug: 254205429
Test: Presubmits
Change-Id: Ib971981559f3b642ce6be8890679e994e1b44be0
2023-03-16 11:13:23 -07: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
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
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
Treehugger Robot
feeee3ad26 Merge "make tidy attribute tri-state" 2023-03-16 15:42:21 +00:00
Jeongik Cha
1743abb88e Add --ninja_weight_source option am: 0cf44d5e8d
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2486497

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

Change-Id: I322c6731aa4a1508fe0b38d7567b6ee722a0880d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 15:14:25 +00:00
Sam Delmerico
5f90649036 remove stub dependency on source_library
Since the source_library attribute of _cc_stub_library_shared was a
label attribute, the source library was added as a dependency of the
stub which doesn't always make sense. E.g. it caused validation actions
for the source library to run even when we weren't building the source
library.

This change converts the label attriubte to a string attribute so that
we don't add the dependency.

Bug: 263390551
Change-Id: I19c62d1e14847dff68ab37156452addaa119eaf9
2023-03-16 10:01:22 -04:00
Jeongik Cha
0cf44d5e8d Add --ninja_weight_source option
It has 3 options for now.
* ninja_log: uses ninja log file for data source
* evenly_distributed: pass empty list for ninja to consider every work as the same
* not_used: do not use critical path logic in ninja

In addition, I added the option in the metrics to track

Bug: 271527305
Test: m --ninja_weight_source=ninja_log|empty|not_used
Change-Id: Ib4c812c20606a34b17d3f0edb71057b477c4f90e
2023-03-16 19:52:27 +09:00
Jeongik Cha
767ce714bb Add time unit for CriticalPathInfo's fields' name
Bug: 271526845
Test: check metrics
Change-Id: Ie7e133033371906b29caad16d0b6bcd238b9f8db
2023-03-16 18:29:55 +09:00
Jiakai Zhang
b879620ca8 Revert^2 "Generate a boot image extension for mainline BCP...
Revert submission 2465993-boot-image-mainline-revert

Reason for revert: Relanding the changes

Reverted changes: /q/submissionid:2465993-boot-image-mainline-revert

Change-Id: Ie611cf3a1ff4be7a7beab164f69b4186c474be5c
2023-03-16 08:46:29 +00:00
Prashanth Swaminathan
0344c024fd Enable VNDK when version matches platform VNDK
When evaluating whether to build the VNDK for the multi-target
configurations, we construct the API level based on the VNDK
version. When the VNDK version is 'current', we replace the
version name with the platform SDK version e.g. 'UpsideDownCake'.

For architectures that currently have a MinApiArch of FutureApiLevel
(i.e. 'current'), comparing 'UpsideDownCake' with 'current' will
assume 'current' is at a higher API level and skip building the
VNDK.

Before perofrming the API level comparison, we check that the VNDK
version does not match the platform VNDK version. If true, it is
necessary to disable the VNDK when it does not meet the minimum API
level for the architecture. If false, we skip this check and allow
the VNDK to be enabled, as this implies we are targeting the 'current'
VNDK version and should include the target platform VNDK.

Test: m (soong test) & boot
Change-Id: Iacc33d2858fef670ddfdff5bbde9d32b084979c9
2023-03-15 23:28:45 -07:00
Treehugger Robot
634d176540 Merge "Add --multitree-build flag" am: da4a78bf40
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2488599

Change-Id: I8628724e64418bef53410d04b7b8ba7ef6cfdf9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 03:17:36 +00:00
Dan Willemsen
aa2b7cc21d Rename mk2rbc/cmd to make go install work properly
The standard go tooling assumes that a package's binary name should be
the name of the containing folder. Before this change, `go install` or
`go build` (without `-o`) names this binary `cmd`.

Test: treehugger
Change-Id: I45a4e97f4a0d59744d644e30636250ceefe3bd1c
2023-03-15 22:51:01 -04:00
Treehugger Robot
da4a78bf40 Merge "Add --multitree-build flag" 2023-03-16 02:34:22 +00:00
Justin Yun
24b246a7a8 Fix the make name of rust snapshots
Rust snapshot must have proper suffix for androidmk to avoid conflict
with the existing modules.

Bug: 230780263
Bug: 235895567
Test: m nothing
Change-Id: I35794196553621cd722c067d7965b2a61aa351bd
2023-03-16 11:05:41 +09:00
Treehugger Robot
c8bd4070b4 Merge "Add external/escapevelocity to allowlist" am: eabe937355
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2490499

Change-Id: Ife1255e555e3acddb3e1e64eddab4c0d3bb679c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 00:27:33 +00:00
Treehugger Robot
eabe937355 Merge "Add external/escapevelocity to allowlist" 2023-03-15 23:48:26 +00:00