Cole Faust
a5f31a5820
Only search for test suite jdk files once
...
compatibility.mk is included 33 times on aosp, and 47 times on
internal master. Each of these would run this shell command, and
there would be an entry in the kati stamp file for each time it was
run, causing this command to be run the 33/47 times every single build.
This took ~0.2 seconds, which can be saved by only running it once.
(However these ~0.2 seconds are parallelized with other parts of the
stamp checking)
Bug: 282079550
Test: m nothing
Change-Id: I364836d1cb0cc26ca9116eda6d954170e1cb7761
2023-05-11 18:22:03 -07:00
Cole Faust
ab4f856bbc
Remove gpl_source.tgz
...
This file was an archive of all the gpl files that could be found
in the source tree. Because it looks for gpl files using $(wildcard),
kati had to rerun the wildcards every single build to see if they had
changed. These GPL wildcards made up 30294 of 63996 wildcards present
on aosp-master. Removing these wildcards saves (aosp/internal) ~0.2/~0.1
seconds from every build, and ~0.4/~0.6 seconds from the wildcard
checking portion of kati. (The whole build sees <0.4s/0.6s of
improvement because it's parallelized with the shell checking, but
improvements here mean that we can now improve the shell commands as
well and get more fruitful results)
We don't actually use gpl_source.tgz anywhere, so we can just remove it.
Bug: 282079550
Test: m nothing
Change-Id: I77141dbb39b2d8ebd96bc258fe7dbdff5a372977
2023-05-11 18:00:38 -07:00
Treehugger Robot
f08f1ad8f9
Merge "Remove wildcards of absolute paths" am: dc5ec0bfd8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2584263
Change-Id: I3f0c9757d28dae10826ebd6ca8757dde0cd1bdbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 23:56:35 +00:00
Treehugger Robot
dc5ec0bfd8
Merge "Remove wildcards of absolute paths"
2023-05-11 23:19:02 +00:00
Wei Li
fd7e6517d3
Some changes to support SBOM generation for b build unbundled APEXs.
...
1) Use output file path of installed files in build system since there is no PRODUCT_OUT in Bazel
2) Use CONTAINS to describe the relationship between a APEX and files it contains
3) Generate SBOM of APEXs, which is similar to SBOM of products
Bug: 275472038
Test: CIs
Change-Id: I41622366e5e6ed9dc78cca7bc7bb69a1f8f9bd9f
2023-05-11 13:58:37 -07:00
Joe Onorato
964f401281
Add release flag logic based on TARGET_RELEASE.
...
Test: Lots of manual testing
Change-Id: I9072f136e64576009d0debd057c8ce6918fae861
2023-05-11 12:53:36 -07:00
Cole Faust
a6ff248861
Merge "Allow importing starlark code in makefiles" am: 99d89154f1
am: 0a9d1d6025
am: 7933d9b60e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2583544
Change-Id: I051f90e8fedbf1b40b3b94e12eac53826f6b9092
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 18:41:32 +00:00
Daniel Zheng
91e0520eb4
Merge "Adding fastboot-info to target-files" am: 8d18a7b5fe
am: dca6b2c4e9
am: 72e125fbd0
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2585027
Change-Id: I226bb2455250c3c2c77227611a2b9f9f595cb39e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 17:15:22 +00:00
Cole Faust
0a9d1d6025
Merge "Allow importing starlark code in makefiles" am: 99d89154f1
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2583544
Change-Id: If559b5f4119df6b19c42f5bf60f738ddf4365d8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 17:14:36 +00:00
Daniel Zheng
9f10ae20d2
Merge "Default building fastboot-info" am: 78249fb190
am: a6616e1e36
am: 87591ccdbb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2585026
Change-Id: Ia5b8f8dfb455be69abd44816c10b11795013b258
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 17:14:25 +00:00
Cole Faust
99d89154f1
Merge "Allow importing starlark code in makefiles"
2023-05-11 17:04:46 +00:00
Daniel Zheng
dca6b2c4e9
Merge "Adding fastboot-info to target-files" am: 8d18a7b5fe
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2585027
Change-Id: I2e1ddc061fb3416a19a028c7136bf10877039a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 15:48:18 +00:00
Daniel Zheng
a6616e1e36
Merge "Default building fastboot-info" am: 78249fb190
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2585026
Change-Id: Idfdea112e9e4543e249b33a9d44adb67a5cc36e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 15:48:06 +00:00
Daniel Zheng
8d18a7b5fe
Merge "Adding fastboot-info to target-files"
2023-05-11 15:42:20 +00:00
Daniel Zheng
78249fb190
Merge "Default building fastboot-info"
2023-05-11 15:19:32 +00:00
Cole Faust
8f92d4194f
Remove wildcards of absolute paths
...
PRODUCT_DEX_PREOPT_PROFILE_DIR could be an empty string, leading to
a wildcard starting with /.
Test: m nothing
Change-Id: Ic745ed4b55cdf5d5d6b43f91c9e5f0c23635c618
2023-05-10 19:04:34 -07:00
Treehugger Robot
75e09e46d8
Merge "Revert "Revert "Parallelize generation of OTA package and target_file packing""" am: 6cc53f12b2
am: 895afc6a7b
am: b8933aae7c
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2585565
Change-Id: Id3001c3c151413f929f31c49c14f4f458741ebf8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-11 00:28:32 +00:00
Treehugger Robot
895afc6a7b
Merge "Revert "Revert "Parallelize generation of OTA package and target_file packing""" am: 6cc53f12b2
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2585565
Change-Id: I211bd75753bd04bce848248a9fe8238c2d459b48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 22:56:56 +00:00
Treehugger Robot
6cc53f12b2
Merge "Revert "Revert "Parallelize generation of OTA package and target_file packing"""
2023-05-10 22:11:01 +00:00
Treehugger Robot
7c953e9ccb
Merge "Also disable dexpreopt for boot images for unbundled builds." am: 081bad48eb
am: 52d9e9bb7f
am: 20e560fde3
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2583331
Change-Id: Id537f9461b539d61c85c823723eb4621e456c14a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 20:22:58 +00:00
Treehugger Robot
52d9e9bb7f
Merge "Also disable dexpreopt for boot images for unbundled builds." am: 081bad48eb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2583331
Change-Id: Ie06fa57cc87e8485806ac5fbfa882c71c9865fe8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 18:55:31 +00:00
Jiakai Zhang
81cd7533c9
Also disable dexpreopt for boot images for unbundled builds.
...
This fixes the tradefed build error caused by aosp/2582191.
Bug: 280440941
Test: `BUILD_BROKEN_DISABLE_BAZEL=true m dist` on tradefed branch.
(cherry picked from https://android-review.googlesource.com/q/commit:c74a4011e2815f2ffc3815176c958a0fdabbd621 )
Merged-In: I34c9fea0a5f7110c9b2bda1986df82afa3eafc79
Change-Id: I34c9fea0a5f7110c9b2bda1986df82afa3eafc79
2023-05-10 18:31:22 +00:00
Treehugger Robot
081bad48eb
Merge "Also disable dexpreopt for boot images for unbundled builds."
2023-05-10 18:16:54 +00:00
Kelvin Zhang
01e67f6942
Revert "Revert "Parallelize generation of OTA package and target_file packing""
...
This reverts commit be63f84810
.
Reason for revert: already fixed by aosp/2577072
Change-Id: I8b6c02378b1b43947575af94a6702e7d6dfd5891
2023-05-10 17:03:40 +00:00
Bruno BELANYI
c4fc23e7fd
Merge "Revert "Parallelize generation of OTA package and target_file packing"" am: 81b5bf4831
am: 2df383ef92
am: 3b640616a8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2583332
Change-Id: I69d008d17d3f9cf0757533ddf24a5cae1374296d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 16:06:09 +00:00
Bruno BELANYI
2df383ef92
Merge "Revert "Parallelize generation of OTA package and target_file packing"" am: 81b5bf4831
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2583332
Change-Id: I716035f7a8dc6403cc16a26bc5fd675706a426c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-10 14:41:02 +00:00
Bruno BELANYI
81b5bf4831
Merge "Revert "Parallelize generation of OTA package and target_file packing""
2023-05-10 13:53:39 +00:00
Bruno BELANYI
be63f84810
Revert "Parallelize generation of OTA package and target_file packing"
...
This reverts commit e30acf1b3f
.
Reason for revert: DroidMonitor-triggered revert due to breakage b/281778022
Change-Id: Ie1ffc86d1ad181d3c8800f9fd57f841d0cf3ac09
2023-05-10 13:46:40 +00:00
Jiakai Zhang
c74a4011e2
Also disable dexpreopt for boot images for unbundled builds.
...
This fixes the tradefed build error caused by aosp/2582191.
Bug: 280440941
Test: `BUILD_BROKEN_DISABLE_BAZEL=true m dist` on tradefed branch.
Change-Id: I34c9fea0a5f7110c9b2bda1986df82afa3eafc79
2023-05-10 13:54:50 +01:00
Yu Liu
5d4ffb6de8
Support sandboxing genrule
...
Bug: 281067655
Test: local build
Change-Id: Idb8806040f7adcb4c74304aaf17ced260472b6b0
2023-05-09 17:24:18 -07:00
Treehugger Robot
850fa4b41a
Merge "Parallelize generation of OTA package and target_file packing" am: 06ece3c666
am: 7b7e151175
am: b5620721b8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2577072
Change-Id: I0331d0c2cbbdc24c697aa28cb47d2f95763fe241
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 23:02:10 +00:00
Cole Faust
c63ce1ab58
Allow importing starlark code in makefiles
...
Adds a new `$(call run-starlark,my/starlark/file.bzl)` function that
will run the starlark file and set all the variables in the
variables_to_export_to_make dictionary as make variables.
Fixes: 280685526
Test: m nothing repeatedly causes no ninja regeneration, but touching all_versions.bzl does. go test, ./out/rbcrun -mode=rbc ./build/make/tests/run.rbc
Change-Id: Ic72e18dd28dba8233ba2dfb658b5d03ccece1bfd
2023-05-09 15:12:58 -07:00
Treehugger Robot
7b7e151175
Merge "Parallelize generation of OTA package and target_file packing" am: 06ece3c666
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2577072
Change-Id: I889b1af8085546b6fa79f80243ec18ba47a0366b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 21:35:52 +00:00
Treehugger Robot
06ece3c666
Merge "Parallelize generation of OTA package and target_file packing"
2023-05-09 21:04:55 +00:00
Daniel Zheng
c1ffd4c7a6
Adding fastboot-info to target-files
...
Added so img_from_target_files can read and add fastboot-info.txt to
updatepackage
Test: m target-files-package
Bug: 194686221
Change-Id: Ia42d7174ef8a4119774057fa7c33f9a409e7ec30
2023-05-09 13:38:10 -07:00
Treehugger Robot
08d4c656e6
Merge "Add lunch support for TARGET_RELEASE" am: 20f0cd3f91
am: 1e09574871
am: 05944a6fcf
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2580693
Change-Id: I15e60297d9a9680028c71ccb093030528b5c350d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 15:56:28 +00:00
Treehugger Robot
1e09574871
Merge "Add lunch support for TARGET_RELEASE" am: 20f0cd3f91
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2580693
Change-Id: I10d0609f04c3a51a238643d08b386ca0dbcec17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 14:28:28 +00:00
Treehugger Robot
20f0cd3f91
Merge "Add lunch support for TARGET_RELEASE"
2023-05-09 13:51:19 +00:00
Treehugger Robot
b03cf2a481
Merge "Remove unneeded rbcrun features" am: 872023376e
am: 9840061379
am: 512662b325
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2580473
Change-Id: I22bceef5fc680e44bbdd67d7a0e05c087a3de022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 10:04:17 +00:00
Treehugger Robot
9840061379
Merge "Remove unneeded rbcrun features" am: 872023376e
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2580473
Change-Id: Ia8b8f735b272a8a61eb989ecef819516b3a9f2b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 08:15:26 +00:00
Treehugger Robot
872023376e
Merge "Remove unneeded rbcrun features"
2023-05-09 07:31:40 +00:00
Daniel Zheng
b4148cb836
Merge "fix m fastboot_info" am: 1f09d54104
am: 5cfa89b404
am: 4bea5638a8
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2579337
Change-Id: I6d4878dbd5e6068438ba3fe24e5f69fd76130c9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 23:22:42 +00:00
Daniel Zheng
5cfa89b404
Merge "fix m fastboot_info" am: 1f09d54104
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2579337
Change-Id: Ie17f4e859c3eb86398a45aec8147c63860d86ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 19:23:22 +00:00
Daniel Zheng
eea63fae85
Default building fastboot-info
...
Having fastboot-info build by default
Test: m
Bug: 194686221
Change-Id: Ic8a524c856604aaac15d52f74bacd7a5943e87c1
2023-05-08 12:11:56 -07:00
Daniel Zheng
1f09d54104
Merge "fix m fastboot_info"
2023-05-08 19:00:10 +00:00
Jeff Hamilton
a02c747449
Add lunch support for TARGET_RELEASE
...
This replaces support for the unused
TARGET_PLATFORM_VERSION variable.
Now, if you pass three - separated
items the first is product, the
second is release and the third
is variant. If you only pass two
they're still product-variant
and the build system will choose
a reasonable default for release.
Test: run lunch with two and three items, confirmed values in the build banner
Change-Id: I128177d96ffe81b79b6945a24ebf37861c3b25fc
2023-05-08 03:23:30 +00:00
Daniel Zheng
67b5cea7d3
Merge "Adding Build time flag to specify Cow Version" am: d00675c764
am: 5236cee23c
am: 45084f0317
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2576750
Change-Id: If8a52e067082defb1ac07c2de79386d5bb19c199
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-06 00:10:59 +00:00
Daniel Zheng
5236cee23c
Merge "Adding Build time flag to specify Cow Version" am: d00675c764
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2576750
Change-Id: Ic963ae9dee979073592a88bcaf249409cbe36136
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-05 22:47:32 +00:00
Daniel Zheng
d00675c764
Merge "Adding Build time flag to specify Cow Version"
2023-05-05 22:19:02 +00:00
Daniel Zheng
2b7ddbda54
fix m fastboot_info
...
m fastboot_info was not working. make syntax is weird
Test: m fastboot_info
Change-Id: Ifebb6e40f2c19f00436afa719259df97ce929490
2023-05-05 14:22:15 -07:00