Commit Graph

84719 Commits

Author SHA1 Message Date
Treehugger Robot
7de4d04c10 Merge "Only search for test suite jdk files once" am: 6961b14269 am: e72f71968a
Original change: https://android-review.googlesource.com/c/platform/build/+/2585683

Change-Id: I7b0bae77650126d4cfaba5fd6e62cb7bd6e5f91e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 07:03:11 +00:00
Treehugger Robot
e72f71968a Merge "Only search for test suite jdk files once" am: 6961b14269
Original change: https://android-review.googlesource.com/c/platform/build/+/2585683

Change-Id: I8102ee297fbba527a6e997bc939681ec407e0b0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:23:53 +00:00
Treehugger Robot
98e0723e4c Merge "parallelize add_partition_calls" am: 96b51b54b6 am: d5dc0c17fe
Original change: https://android-review.googlesource.com/c/platform/build/+/2585397

Change-Id: I1514ebc43078cbf18e977b0a8b97c03f286bcb35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:00:53 +00:00
Daniel Zheng
bb676a1eaf Merge "Add fastboot-info to updatepackage" am: 717591dd4e am: 6b558b3fe4
Original change: https://android-review.googlesource.com/c/platform/build/+/2583539

Change-Id: Ic69f8fd99922a634ad2bf65e14fb3e1b7cc43399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 06:00:39 +00:00
Treehugger Robot
6961b14269 Merge "Only search for test suite jdk files once" 2023-05-12 05:53:11 +00:00
Treehugger Robot
d5dc0c17fe Merge "parallelize add_partition_calls" am: 96b51b54b6
Original change: https://android-review.googlesource.com/c/platform/build/+/2585397

Change-Id: I58e1b516a5109eaed483af1c8b9979f838e0b96f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 05:19:41 +00:00
Daniel Zheng
6b558b3fe4 Merge "Add fastboot-info to updatepackage" am: 717591dd4e
Original change: https://android-review.googlesource.com/c/platform/build/+/2583539

Change-Id: I92a70b845d04e2f251eed2b96fbcfe58d57ffeea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 05:19:25 +00:00
Treehugger Robot
96b51b54b6 Merge "parallelize add_partition_calls" 2023-05-12 04:54:11 +00:00
Daniel Zheng
717591dd4e Merge "Add fastboot-info to updatepackage" 2023-05-12 04:31:55 +00:00
Joe Onorato
993648e7fa Merge "Add release flag logic based on TARGET_RELEASE." am: 48fbf97b3e am: 6a3278d350
Original change: https://android-review.googlesource.com/c/platform/build/+/2581130

Change-Id: Ia5c31cc531e44d9d4743d026594a3d4b3d3f8fb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 03:09:48 +00:00
Joe Onorato
6a3278d350 Merge "Add release flag logic based on TARGET_RELEASE." am: 48fbf97b3e
Original change: https://android-review.googlesource.com/c/platform/build/+/2581130

Change-Id: I15290ed9a3ceb59a4acba9a7075d457f95536e1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 02:30:44 +00:00
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
Treehugger Robot
272c85aa6c Merge "Remove wildcards of absolute paths" am: dc5ec0bfd8 am: f08f1ad8f9
Original change: https://android-review.googlesource.com/c/platform/build/+/2584263

Change-Id: Ibbc3bfceed8b5ed034094f1542c4f656755067c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:36:24 +00: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
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
7933d9b60e Merge "Allow importing starlark code in makefiles" am: 99d89154f1 am: 0a9d1d6025
Original change: https://android-review.googlesource.com/c/platform/build/+/2583544

Change-Id: Ibe00b6e3cebb1e3b0b724cb4c95e389a3e713c89
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 17:52:28 +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
Cole Faust
99d89154f1 Merge "Allow importing starlark code in makefiles" 2023-05-11 17:04:46 +00:00
Daniel Zheng
72e125fbd0 Merge "Adding fastboot-info to target-files" am: 8d18a7b5fe am: dca6b2c4e9
Original change: https://android-review.googlesource.com/c/platform/build/+/2585027

Change-Id: Iecaf01655f04f04f825362d6037643eb0dbac956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 16:28:11 +00:00
Daniel Zheng
87591ccdbb Merge "Default building fastboot-info" am: 78249fb190 am: a6616e1e36
Original change: https://android-review.googlesource.com/c/platform/build/+/2585026

Change-Id: I3e66aacacd813e85a117cbbe7c74492255dcc88e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 16:27:53 +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
Mårten Kongstad
ed130f11ed Merge "aconfig: Add codegen for java" am: 7b6aacb055 am: 86d0c527c0
Original change: https://android-review.googlesource.com/c/platform/build/+/2583478

Change-Id: I32a8c36cf3763f6f54097e5773cb8a9dcfdb5eaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 09:07:32 +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
b8933aae7c Merge "Revert "Revert "Parallelize generation of OTA package and target_file packing""" am: 6cc53f12b2 am: 895afc6a7b
Original change: https://android-review.googlesource.com/c/platform/build/+/2585565

Change-Id: Ib180118bafd43bd18fc8be6e706255cfaa215a55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 23:39:50 +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
e84e9eaf2f Merge changes from topic "aconfig-part-4" am: ef0a2c21dd am: 13456aa63c
Original change: https://android-review.googlesource.com/c/platform/build/+/2584571

Change-Id: Ib913b728bd0e99ca6ea88148350b026d513c097a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:39:10 +00:00
Treehugger Robot
20e560fde3 Merge "Also disable dexpreopt for boot images for unbundled builds." am: 081bad48eb am: 52d9e9bb7f
Original change: https://android-review.googlesource.com/c/platform/build/+/2583331

Change-Id: I8b9902a4b1c9673ffa406d580d647489681afed2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 19:38:42 +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
Treehugger Robot
e4eea917db Merge "Improve finalization perfomance by building only current version." am: b1a7ba8735 am: 02591d64de
Original change: https://android-review.googlesource.com/c/platform/build/+/2584105

Change-Id: Ibaaa1441d772e240f969d016610f8b83bc93c1ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 17:09:06 +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
Bruno BELANYI
3b640616a8 Merge "Revert "Parallelize generation of OTA package and target_file packing"" am: 81b5bf4831 am: 2df383ef92
Original change: https://android-review.googlesource.com/c/platform/build/+/2583332

Change-Id: I8ed18769e058704690fd3e96904c9fcecf212966
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-10 15:19:44 +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