StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,306 Commits 1 Branch 0 Tags
e80e8b4c5cbde72338ee6e88d3b51a5f36656be2
Commit Graph

87306 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mårten Kongstad
0d0435cec4 Merge "aconfig: use bail! and ensure! where applicable" am: 7890fa3e84 am: bdd924b335 
Original change: https://android-review.googlesource.com/c/platform/build/+/2588765

Change-Id: Ie1fd23e8eb41d517be52e2dab069b8fdf0cecce7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 15:27:26 +00:00
Mårten Kongstad
bdd924b335 Merge "aconfig: use bail! and ensure! where applicable" am: 7890fa3e84 
Original change: https://android-review.googlesource.com/c/platform/build/+/2588765

Change-Id: Iaec315775f38b17825d4c98f077773a6023a1259
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-15 14:48:02 +00:00
Mårten Kongstad
7890fa3e84 Merge "aconfig: use bail! and ensure! where applicable" 2023-05-15 13:54:07 +00:00
Mårten Kongstad
e66b89f635 aconfig: use bail! and ensure! where applicable 
The Android Rust style guide recommends anyhow's bail! and ensure!
macros where possible. Update the code accordingly.

Bug: 279485059
Test: atest aconfig.test
Change-Id: I7db7cc2d8ec15e1d3450657ad000e879adb19e08
 2023-05-15 11:10:12 +02:00
Satoshi Futenma
6d56d45f96 Add merge_ota to otatools 
Bug: 282189563
Test: manual, m otatools-package, confirm that merga_ota is
    present in otatools.zip
Change-Id: I40c3866bfb016aa1dec1c6dc2d95c66deb1e61ea
 2023-05-15 09:06:02 +02:00
Kiyoung Kim
d1aa1cdf44 Rename soong.variable with target product 
Bug: 277029044
Test: build succeeded and checked if out/soong/soong.variable has been
renamed

Change-Id: I035a52f3d8ad80d9e44a55e10fe537556ddecda8
 2023-05-14 11:57:16 +00:00
Steve Berbary
053ad8aa1b Update Security String to 2023-07-01 
Bug: 282371465

Change-Id: I2bb1848e16aff436787a5bf43dbea18012d485a7
Merged-In: I2bb1848e16aff436787a5bf43dbea18012d485a7
 2023-05-13 22:26:11 +00:00
Steve Berbary
26a7d4bd9e Update Security String to 2023-07-01 
Bug: 282371465

Change-Id: I2bb1848e16aff436787a5bf43dbea18012d485a7
Merged-In: I2bb1848e16aff436787a5bf43dbea18012d485a7
 2023-05-13 22:24:28 +00:00
Steve Berbary
ef23512feb [automerge] Update Security String to 2023-07-05 2p: 4fd6e8777b 2p: 39c2792c7a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23227854

Bug: 282371465
Change-Id: I7128e082a505c0748b579dc775bfa1628effb3ec
 2023-05-13 22:22:41 +00:00
Steve Berbary
39c2792c7a [automerge] Update Security String to 2023-07-05 2p: 4fd6e8777b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23227854

Bug: 282371465
Change-Id: I65abe1a7045cfef8bcb3dfd454a168aef7e73471
 2023-05-13 22:22:32 +00:00
Steve Berbary
d6c119bfaa Update Security String to 2023-07-05 
Bug: 282371465
Change-Id: I2bb1848e16aff436787a5bf43dbea18012d485a7
 2023-05-13 22:22:23 +00:00
Treehugger Robot
f17cd7a2f6 [automerger skipped] Merge "Use non-next NetworkStack" am: b87fd73330 am: b028b11a61 am: 7bbdf6eadb -s ours 
am skip reason: Merged-In I00a9840a69d06c6f4246a2db284c3060392b302b with SHA-1 f3f48883bc is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2585789

Change-Id: Ibf8931b63c7cce61d1ad609600ed392b8b2905ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 01:07:50 +00:00
Treehugger Robot
7bbdf6eadb Merge "Use non-next NetworkStack" am: b87fd73330 am: b028b11a61 
Original change: https://android-review.googlesource.com/c/platform/build/+/2585789

Change-Id: I4c0698b6c343013b302fc4da7c285bc3678c6e61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-13 00:21:39 +00:00
Treehugger Robot
b028b11a61 Merge "Use non-next NetworkStack" am: b87fd73330 
Original change: https://android-review.googlesource.com/c/platform/build/+/2585789

Change-Id: I2106a10a68ada3241d81b3ae9f8897efa05f7464
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 23:41:06 +00:00
Treehugger Robot
b87fd73330 Merge "Use non-next NetworkStack" 2023-05-12 23:02:19 +00:00
Mårten Kongstad
f5f9ce388b Merge changes from topic "aconfig-part-5" am: 71f9dabe47 am: 011f6d42b2 am: 3d8ac3610c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2584221

Change-Id: I8a9b331b47bc32c8f8ed2e71b77b12a3df85c639
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 14:28:19 +00:00
Mårten Kongstad
3d8ac3610c Merge changes from topic "aconfig-part-5" am: 71f9dabe47 am: 011f6d42b2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2584221

Change-Id: Ib0e7b3064415c9641f7a92568bebd86e74daa2d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 13:42:24 +00:00
Treehugger Robot
4e7d9f677b Merge "parallelize add_partition_calls only if output_zip is None" am: 8d5d2257d9 am: 531125c397 am: c885fd4a59 
Original change: https://android-review.googlesource.com/c/platform/build/+/2584696

Change-Id: Ie594ab3ef93e9f47d5434bd4976e1ac33065722b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 13:06:08 +00:00
Mårten Kongstad
011f6d42b2 Merge changes from topic "aconfig-part-5" am: 71f9dabe47 
Original change: https://android-review.googlesource.com/c/platform/build/+/2584221

Change-Id: I0520bb7fce7cf788cd45bec7b1897b902dd86bc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 13:03:15 +00:00
Mårten Kongstad
71f9dabe47 Merge changes from topic "aconfig-part-5" 
* changes:
  aconfig: follow Java conventions for Java file paths
  aconfig: separate flag declarations and flag values
 2023-05-12 12:21:02 +00:00
Treehugger Robot
c885fd4a59 Merge "parallelize add_partition_calls only if output_zip is None" am: 8d5d2257d9 am: 531125c397 
Original change: https://android-review.googlesource.com/c/platform/build/+/2584696

Change-Id: Icd8b4d62c0981790d4dc9dca1cf2c67839435b95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 12:18:19 +00:00
Treehugger Robot
531125c397 Merge "parallelize add_partition_calls only if output_zip is None" am: 8d5d2257d9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2584696

Change-Id: Ida95b894dc799345b02aa64b58f4d6392db92d7f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 11:39:56 +00:00
Treehugger Robot
8d5d2257d9 Merge "parallelize add_partition_calls only if output_zip is None" 2023-05-12 10:56:23 +00:00
Mårten Kongstad
d42eeeba3d aconfig: follow Java conventions for Java file paths 
Update codegen_java to write the generated Java file(s) to
"java/package/File.java" instead of just "File.java".

Also generalize codegen_java::GeneratedFile to commands::OutputFile in
preparation for the upcoming C++ and Rust codegen.

Also change Java package name to 'com.android.internal.aconfig'.

Bug: 279485059
Test: atest aconfig.test
Change-Id: I13978697e35010fe6be8637aa495d4b852dbed7e
 2023-05-12 10:01:00 +02:00
Treehugger Robot
dba7b2e967 Merge "Only search for test suite jdk files once" am: 6961b14269 am: e72f71968a am: 7de4d04c10 
Original change: https://android-review.googlesource.com/c/platform/build/+/2585683

Change-Id: I1dd51d6b64e045fa2a6a38432c70357cfec9539b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 07:49:20 +00:00
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
Mårten Kongstad
fa23d2993b aconfig: separate flag declarations and flag values 
Simplify how aconfig configurations work: remove the ability to set flag
values based on build-id.

The aconfig files now some in two flavours:

  - flag declaration files: introduce new flags; aconfig will assign the
    flags a hard-coded default value (disabled, read-write)

  - flag value files: assign flags new values

`aconfig create-cache` expects flags to be declared exactly once, and
for their values to be reassigned zero or more times.

The flag value files are identical what used to be called override
files.

Also, remove the now obsolete build-id parameter: this was used to
calculate default values before applying overrides, and is no longer
needed.

Also rename a few more structs and functions to be closer to the .proto
names. This will make it easier to use the generated proto structs
directly, and get rid of the hand-crafter wrappers.

Bug: 279485059
Test: atest aconfig.test
Change-Id: I7bf881338b0567f932099ce419cac457abbe8df8
 2023-05-12 08:50:49 +02:00
Treehugger Robot
f32297eb62 Merge "parallelize add_partition_calls" am: 96b51b54b6 am: d5dc0c17fe am: 98e0723e4c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2585397

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

Change-Id: Ia96e62a07a458564700f4c652e707da9074b4046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 06:46:48 +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
Jeongik Cha
fa9090946e parallelize add_partition_calls only if output_zip is None 
if output_zip isn't None, writing into zip file in parallel is not
thread-safe.

Bug: 281960217
Test: m dist
Change-Id: I10d68a4bb779cee244f40410ec95d38ca6040306
 2023-05-12 15:14:58 +09: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
60ebe5ec28 Merge "Add release flag logic based on TARGET_RELEASE." am: 48fbf97b3e am: 6a3278d350 am: 993648e7fa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2581130

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

Change-Id: I3107faccda40390835c7bd2b05b957a6174038c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-12 01:22:56 +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
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
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