Commit Graph

85413 Commits

Author SHA1 Message Date
Joe Onorato
48fbf97b3e Merge "Add release flag logic based on TARGET_RELEASE." 2023-05-12 01:44:46 +00:00
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
Jeongik Cha
03d014a03f parallelize add_partition_calls
it made total time equal to the longest image build

1m10s->30s in local build

Bug: 281960217
Test: m dist
Change-Id: I13d4f45d9b46b39292a014e3b4e1913365d89b7a
2023-05-12 08:43:44 +09: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
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
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
Motomu Utsumi
49488cff38 Use non-next NetworkStack
NetworkStack now builds against stable U APIs, so U can use
the stable binaries instead of the "next" versions.

Since it has just been bumped, NetworkStack is equivalent to
NetworkStackNext at this point, so this is a no-op.

Bug: 280250560
Test: m
Ignore-AOSP-First: This CL will be cherry-picked to aosp
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f3f48883bcfe8a8f46fdec7affd545c81ba1a8ee)
Merged-In: I00a9840a69d06c6f4246a2db284c3060392b302b
Change-Id: I00a9840a69d06c6f4246a2db284c3060392b302b
2023-05-11 12:40:42 +00:00
Mårten Kongstad
86d0c527c0 Merge "aconfig: Add codegen for java" am: 7b6aacb055
Original change: https://android-review.googlesource.com/c/platform/build/+/2583478

Change-Id: I8bd49c346fdd4f2e30c5033f63783e66bc7d4bb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 08:24:31 +00:00
Mårten Kongstad
7b6aacb055 Merge "aconfig: Add codegen for java" 2023-05-11 07:51:19 +00:00
Zhi Dou
eb74489b3a aconfig: Add codegen for java
Add codegen for java skeleton

Bug: 279485059
Test: atest aconfig.test
Change-Id: Ia0481cec9c2e137e88e9a77d1b82412529b64adc
2023-05-11 03:08:53 +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
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
13456aa63c Merge changes from topic "aconfig-part-4" am: ef0a2c21dd
Original change: https://android-review.googlesource.com/c/platform/build/+/2584571

Change-Id: I7bb9c8cfab6084b27ce8e62afabe747bb05e43a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:38:09 +00:00
Treehugger Robot
ef0a2c21dd Merge changes from topic "aconfig-part-4"
* changes:
  aconfig: introduce namespace, rename proto messages
  aconfig: add dump protobuf format
2023-05-10 19:22:00 +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
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
Treehugger Robot
02591d64de Merge "Improve finalization perfomance by building only current version." am: b1a7ba8735
Original change: https://android-review.googlesource.com/c/platform/build/+/2584105

Change-Id: I2386fa0a10a112343d0ba20ac256368bec7dbcc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 16:05:07 +00:00
Treehugger Robot
b1a7ba8735 Merge "Improve finalization perfomance by building only current version." 2023-05-10 15:19:12 +00:00
Mårten Kongstad
3095078981 aconfig: introduce namespace, rename proto messages
Flags belong to a namespace. Update the proto files to reflect this.

Config files can only refer to a single namespace. Override files can
refer to multiple namespaces; an override directive for a flag in a
different namespace than the one represented by the cache will be
silently ignored.

Rename the proto messages to make it more clear what they are. Propagate
this change through the wrappers in aconfig.rs and the rest of the code.

Also, settle on Tracepoint instead of TracePoint.

Bug: 279485059
Test: atest aconfig.test
Change-Id: I16e69dd14687bc498b2ba89d6a35879459903801
2023-05-10 17:17:20 +02: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
Kelvin Zhang
06417aaa9e Merge "Fix non-AB ota generation for directories" am: ea70695d92
Original change: https://android-review.googlesource.com/c/platform/build/+/2585207

Change-Id: I7a6472946360238393a734640e27557f7623446f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 04:46:20 +00:00
Kelvin Zhang
ea70695d92 Merge "Fix non-AB ota generation for directories" 2023-05-10 04:07:09 +00:00
Kelvin Zhang
b036007592 Fix non-AB ota generation for directories
Test: ota_from_target_files -v --block yukawa-target_files-10097950.zip
test.zip

Change-Id: I4291010d66cc28bdb6b6b334cdbed06daf3de837
2023-05-09 20:30:53 -07:00
Alex Buynytskyy
aac2a187d4 Improve finalization perfomance by building only current version.
Bug: 275409981
Test: run locally
Change-Id: If531178a17792166726ff7ed230592c392eeb899
2023-05-10 03:10:32 +00:00
Android Build Coastguard Worker
caf3497718 [coastguard skipped] Merge sparse cherrypicks from sparse-10099262-L86600000960563267 into tm-qpr3-release.
COASTGUARD_SKIP: I3c3e86941fdff2e8aec8f6adeac5ebde20c4c2d4

Change-Id: Ic6e6fbb7d0c3eddfe6d1c84e0be9bd80893ec926
2023-05-10 02:58:10 +00:00
Android Build Coastguard Worker
793db33652 Version bump to TQ3A.230605.009.A1 [core/build_id.mk]
Change-Id: I3c3e86941fdff2e8aec8f6adeac5ebde20c4c2d4
2023-05-10 02:54:52 +00:00
Yu Liu
5d4ffb6de8 Support sandboxing genrule
Bug: 281067655
Test: local build
Change-Id: Idb8806040f7adcb4c74304aaf17ced260472b6b0
2023-05-09 17:24:18 -07:00
Android Build Coastguard Worker
105f43f6a7 Version bump to TQ3A.230605.009 [core/build_id.mk]
Change-Id: I96b0cf88c0a58c0628d11ecf3ad48ab8e0064987
2023-05-09 23:27:33 +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
380cb8065a Add fastboot-info to updatepackage
Modifying img_from_target_files to also add fastboot-info to
updatepackage

Test: m updatepackage
Bug: 194686221
Change-Id: I2e08c4269f0d83417b9d7079633bc28796d1cdd6
2023-05-09 13:44:22 -07: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
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
Mårten Kongstad
a102909e09 aconfig: add dump protobuf format
Introduce a new protobuf format to represent the all flags parsed by
aconfig. This data in this new format is similar to that of the internal
cache object, but the protobuf is a public API for other tools to
consume and any changes to the proto spec must be backwards compatible.

When aconfig has matured more, Cache can potentially be rewritten to
work with proto structs directly, removing some of the hand-written
wrapper structs and the logic to convert to and from the proto structs.
At this point, the intermediate json format can be replaced by the
protobuf dump.

Also, teach `aconfig dump` to accept an --out <file> argument (default:
stdout).

Also, teach `aconfig dump` to read more than once cache file.

Note: the new protobuf fields refer to existing fields. It would make
sense to split the .proto file in one for input and one for output
formats, and import the common messages, but the Android build system
and cargo will need different import paths. Keep the definitions in the
same file to circumvent this problem.

Bug: 279485059
Test: atest aconfig.test
Change-Id: I55ee4a52c0fb3369d91d61406867ae03a15805c3
2023-05-09 15:27:42 +02: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