StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
88,516 Commits 1 Branch 0 Tags
ae2e7cf645dd830af59bd67fa13fd974bc67eb8c
Commit Graph

88516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
9d9e540cc5 Merge "Fix usage message." am: fb8c86513e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2625356

Change-Id: I7b1b9db8ded7ae73aa94152c66032aebffaa2186
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 19:53:45 +00:00
Treehugger Robot
6df5275646 Merge "Fix godoc typos." am: d999938ab0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628611

Change-Id: I7a4b16d885e777143143d8beeffea38ddd77b6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 19:53:30 +00:00
Treehugger Robot
fb8c86513e Merge "Fix usage message." 2023-06-19 19:20:15 +00:00
Jiakai Zhang
96b155c018 Add an entry in METADATA.txt to determine whether to use the CMC GC. 
If the device uses the CMC GC, the file will contain:
extra-args = --runtime-arg -Xgc:CMC

Otherwise, the file will contain an empty line:
extra-args =

Bug: 287652269
Test: -
  1. m dist out/dist/boot.zip
  2. unzip -p out/dist/boot.zip METADATA.txt
Change-Id: I3d50367eb2a341e1c03286d7a2cd7ed44d59708f
 2023-06-19 20:20:05 +01:00
Treehugger Robot
d999938ab0 Merge "Fix godoc typos." 2023-06-19 19:10:47 +00:00
Mårten Kongstad
a2e5ab82c7 aconfig: make proto fields optional 
Change all required proto fields to optional. While the proto file is
supposed to be a backwards compatible API, and fields are not supposed
to be deprecated, this commit will allow for that option if needed.

Implementation wise this change doesn't matter much: any parsed data
needs additional verification outside what the protobuf crate's parser
provides anyway, so adding checks to verify that all required fields,
even though marked optional in the proto file, were found is a minor
increase in code complexity.

If in the future a proto field should no longer be used:

  - keep the field in the proto, still marked optional and clearly
    document that it is no longer in use
  - change protos.rs from checking struct.has_field() to explicitly
    dropping any value via struct.clear_field()

Bug: 286337317
Test: atest aconfig.test
Change-Id: Iad1ccfe50ecac286ff7a796aec909bec70b9520d
 2023-06-19 16:53:22 +02:00
Treehugger Robot
9ca1ba8ed6 Merge changes from topic "aconfig-prepare-for-proto-structs" am: a99ac90eb5 am: 36e4f3fb37 am: 643be21ccb am: 3a2c089415 am: 99823033c7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628050

Change-Id: I7db78c678a351dc3fd8d9a53ce0dc19cc805b5b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 14:12:24 +00:00
Mårten Kongstad
a2e152a139 aconfig: generate Java flag name constants 
Generate Java constants for use in @FlaggedApi(flag = ...).

Also update the generated Java code to use the constants when reaching
out to DeviceConfig instead of hard-coding (duplicate) strings.

Bug: 285288440
Test: atest aconfig.test aconfig.test.java
Change-Id: I1127cacba650cc7a7896b1533e03631d7f5ec71b
 2023-06-19 16:12:01 +02:00
Mårten Kongstad
403658f9cb aconfig: use proto struct directly 
Remove the hand-crafted wrappers around the structures auto-generated
from protos/aconfig.proto, and use the auto-generated structs directly
intead. This gets rid of a lot of manual repetition, and its inherent
risk.

Also unify how individual fields read from text proto are verified (e.g.
is the flag.name field a valid identifier).

Also change the intermediate cache format from JSON to binary protobuf.

The concept of a 'cache' as an intermediate internal format to represent
parsed input stays. The command line interface still refers to caches.
At the moment a cache file is identical to a parsed_file protbuf, and
the code exploits this internally.

A couple of points regarding the auto-generated structs:

  - Vectors are named in the singular (e.g. parsed_flags.parsed_flag is
    a Vec<ProtoParsedFlag>) because this improves ergonomics for all
    devs working with aconfig input files

  - The auto-generated structs have fields that are of type Option<T>
    and convenience methods (named the same as the fields) to access T

Test: atest aconfig.test aconfig.test.java
Bug: 283910447
Change-Id: I512820cc4bc6c543dea9f6a4356f863120a10be3
 2023-06-19 16:04:32 +02:00
Treehugger Robot
99823033c7 Merge changes from topic "aconfig-prepare-for-proto-structs" am: a99ac90eb5 am: 36e4f3fb37 am: 643be21ccb am: 3a2c089415 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628050

Change-Id: I604f4669a8d1eb19449fefc63eed994584219ea8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 13:33:52 +00:00
Treehugger Robot
3a2c089415 Merge changes from topic "aconfig-prepare-for-proto-structs" am: a99ac90eb5 am: 36e4f3fb37 am: 643be21ccb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628050

Change-Id: I5c5138bdba4275aee2eab015e3246f64c8715acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 12:51:37 +00:00
Treehugger Robot
643be21ccb Merge changes from topic "aconfig-prepare-for-proto-structs" am: a99ac90eb5 am: 36e4f3fb37 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628050

Change-Id: Idac758da3fd69dca6e94bf5f18a99c2a1ff62951
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 12:05:28 +00:00
Treehugger Robot
9550cbdf46 Merge "Move ro.apex.updatable to the system partition" am: 770bfc34e3 am: 0e3d0523bf am: 416c3d676f am: 3820741906 am: 8f735a8910 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627769

Change-Id: I085a3f1296090f2a2247a6fb8947c680520deefb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 12:05:14 +00:00
Treehugger Robot
36e4f3fb37 Merge changes from topic "aconfig-prepare-for-proto-structs" am: a99ac90eb5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628050

Change-Id: I11dc893158f85eb104ac8085714079c5ca3ad6ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 11:28:46 +00:00
Treehugger Robot
8f735a8910 Merge "Move ro.apex.updatable to the system partition" am: 770bfc34e3 am: 0e3d0523bf am: 416c3d676f am: 3820741906 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627769

Change-Id: I0d59b4e6e14cb63ce9a3ac390a3809070a25de42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 11:28:04 +00:00
Treehugger Robot
3820741906 Merge "Move ro.apex.updatable to the system partition" am: 770bfc34e3 am: 0e3d0523bf am: 416c3d676f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627769

Change-Id: I2281159f8cdece3a4dcfa357318f8cd349ac9ff1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 10:45:24 +00:00
Treehugger Robot
a99ac90eb5 Merge changes from topic "aconfig-prepare-for-proto-structs" 
* changes:
  aconfig: fix incorrect source path in test cache
  aconfig: reduce number of #[cfg(feature = "cargo")] uses
 2023-06-19 10:43:34 +00:00
Treehugger Robot
416c3d676f Merge "Move ro.apex.updatable to the system partition" am: 770bfc34e3 am: 0e3d0523bf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627769

Change-Id: I1056ae69d01c798382cfdca350a65f708d74890c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 09:56:26 +00:00
Treehugger Robot
0e3d0523bf Merge "Move ro.apex.updatable to the system partition" am: 770bfc34e3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627769

Change-Id: I23bcbd5565fb5eda0848b6d5fac0f95a6642c22f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 09:16:55 +00:00
Treehugger Robot
770bfc34e3 Merge "Move ro.apex.updatable to the system partition" 2023-06-19 08:30:52 +00:00
Kelvin Zhang
95656d0de5 [automerger skipped] Handle zip64 extra fields better am: 94fc8b830a am: 5027a2299c -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 94fc8b830a is already in history

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

Change-Id: Iba7bc0f4f0310dbf6721e4457af4d739e271e381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-18 17:29:08 +00:00
Kelvin Zhang
dc3aa06728 [automerger skipped] Handle zip64 extra fields better am: 94fc8b830a -s ours am: 5248e11dac -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 1e774245a4 is already in history

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

Change-Id: Ie8be23d5a453a59b4e927cdda328c1cfdb3075bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-18 17:23:32 +00:00
Kelvin Zhang
5027a2299c Handle zip64 extra fields better am: 94fc8b830a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23740404

Change-Id: I23188dcd4bef408f61743dffe0e3f37ba604bafd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-18 16:39:35 +00:00
Kelvin Zhang
5248e11dac [automerger skipped] Handle zip64 extra fields better am: 94fc8b830a -s ours 
am skip reason: Merged-In I7da89f8389c09cc99201cff342483c158bd7e9c1 with SHA-1 1e774245a4 is already in history

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

Change-Id: Ib5dcfd44617c9b6f9666fd3c0148381b46accce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-18 16:35:20 +00:00
Kelvin Zhang
94fc8b830a Handle zip64 extra fields better 
Test: check_target_files_signatures
Bug: 283033491
(cherry picked from https://android-review.googlesource.com/q/commit:1e774245a4dd2763545827d65462e5c115eecb63)
Merged-In: I7da89f8389c09cc99201cff342483c158bd7e9c1
Change-Id: I7da89f8389c09cc99201cff342483c158bd7e9c1
 2023-06-18 10:33:27 +00:00
Treehugger Robot
ec106e19f4 Merge "Handle zip64 extra fields better" am: 57c1aa7b16 am: 5c3a34b358 am: acddbb78de am: dab757ddc2 am: d2e6018e93 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628431

Change-Id: I88cfba71439c700ab2b20095b0f649173e8faede
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-18 02:10:31 +00:00
Treehugger Robot
d2e6018e93 Merge "Handle zip64 extra fields better" am: 57c1aa7b16 am: 5c3a34b358 am: acddbb78de am: dab757ddc2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628431

Change-Id: Ia478128cca52fc024365f22d163dedc2799368ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-18 01:31:21 +00:00
Treehugger Robot
dab757ddc2 Merge "Handle zip64 extra fields better" am: 57c1aa7b16 am: 5c3a34b358 am: acddbb78de 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628431

Change-Id: I40f8a83bcd76d49a4512f3f26079442696e07fc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-18 00:45:05 +00:00
Treehugger Robot
acddbb78de Merge "Handle zip64 extra fields better" am: 57c1aa7b16 am: 5c3a34b358 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628431

Change-Id: I6b5cf8f14df5c1999bbd5a4eab80abf25bd8e829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 23:56:26 +00:00
Treehugger Robot
5c3a34b358 Merge "Handle zip64 extra fields better" am: 57c1aa7b16 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628431

Change-Id: Ieefcc8ee08c2d91f447fc5209967d43db7454c75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 23:04:21 +00:00
Treehugger Robot
57c1aa7b16 Merge "Handle zip64 extra fields better" 2023-06-17 22:12:26 +00:00
Kelvin Zhang
1e774245a4 Handle zip64 extra fields better 
Test: check_target_files_signatures
Bug: 283033491
Change-Id: I7da89f8389c09cc99201cff342483c158bd7e9c1
 2023-06-17 09:21:46 -07:00
Wei Li
d263695cd4 Include static libraries information in Android SBOM. 
Bug: 280852724
Test: CIs
Test: lunch aosp_cf_x86_64_phone-userdebug && m sbom
Change-Id: Ie2365d79ba24910b7ace132b578589be10a17d78
 2023-06-16 23:02:09 -07:00
Treehugger Robot
9068a500d1 Merge "Use patch instead of git apply." am: 0d2d11bc00 am: 251eac36ab am: c3afc51e86 am: 4b6b6f95d2 am: e32a687708 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627735

Change-Id: Ibc3cf01446e208aaba3ca946897a3ba18f75e555
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 05:47:30 +00:00
Treehugger Robot
e32a687708 Merge "Use patch instead of git apply." am: 0d2d11bc00 am: 251eac36ab am: c3afc51e86 am: 4b6b6f95d2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627735

Change-Id: I6f4d9f931c5028665a93cf5af6ed2b51e3411d20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 05:06:33 +00:00
Treehugger Robot
4b6b6f95d2 Merge "Use patch instead of git apply." am: 0d2d11bc00 am: 251eac36ab am: c3afc51e86 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627735

Change-Id: I6db10d07636ab82de5b9366f4687b94713472b4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 04:19:12 +00:00
Treehugger Robot
c3afc51e86 Merge "Use patch instead of git apply." am: 0d2d11bc00 am: 251eac36ab 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627735

Change-Id: I8d3d026100c25303bfa196efcbcafd4860e26e5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 03:31:04 +00:00
Treehugger Robot
251eac36ab Merge "Use patch instead of git apply." am: 0d2d11bc00 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627735

Change-Id: Ia63a8d9eb8877d763bcfee18beedba41d775c481
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 02:49:12 +00:00
Treehugger Robot
0d2d11bc00 Merge "Use patch instead of git apply." 2023-06-17 01:56:52 +00:00
Treehugger Robot
79b5bc2b9b Merge "aconfig: change java flag method name to camelCase" am: 59d662524c am: bec4ce710f am: 9c7c5dabaa am: cdfd8e3f4f am: 41b8aa0805 
Original change: https://android-review.googlesource.com/c/platform/build/+/2626776

Change-Id: I209b10615081b97e5b001d02436fefc2d8828559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 01:35:54 +00:00
Treehugger Robot
41b8aa0805 Merge "aconfig: change java flag method name to camelCase" am: 59d662524c am: bec4ce710f am: 9c7c5dabaa am: cdfd8e3f4f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2626776

Change-Id: I730d882a0fa34f59f69a369615d7cd8c691f0f7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 00:55:59 +00:00
Treehugger Robot
cdfd8e3f4f Merge "aconfig: change java flag method name to camelCase" am: 59d662524c am: bec4ce710f am: 9c7c5dabaa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2626776

Change-Id: I5158885f1f8dc25a166c4f06ced7940663fe0042
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-17 00:09:54 +00:00
Treehugger Robot
9c7c5dabaa Merge "aconfig: change java flag method name to camelCase" am: 59d662524c am: bec4ce710f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2626776

Change-Id: I371b95a00f483f2a30ccc6e67cb3ffb7c332dccd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 23:23:39 +00:00
Treehugger Robot
bec4ce710f Merge "aconfig: change java flag method name to camelCase" am: 59d662524c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2626776

Change-Id: I7d5747d6a4a33f6b49e2c13f06bf539c71c324ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 22:41:03 +00:00
Treehugger Robot
59d662524c Merge "aconfig: change java flag method name to camelCase" 2023-06-16 21:49:22 +00:00
Gabriel Biren
fdcf16f55c Add rule to convert WIFI_FEATURE_IMU_DETECTION 
to the equivalent soong variable.

Bug: 287607876
Test: Manual test - add a log message to wifi_ext that
       only prints if the proper flag is enabled.
       Check whether the log is displayed, both before
       and after this change.
Change-Id: Id9bfc81384384b915e9772a2016a9843a57897db
 2023-06-16 21:11:10 +00:00
Alex Buynytskyy
bce1a51df8 Use patch instead of git apply. 
Bug: 281682520
Test: run locally
Change-Id: Ia84055b7a9074836c6d7b3039ba980e39043a41e
 2023-06-16 20:23:36 +00:00
Zhi Dou
af81e20653 aconfig: change java flag method name to camelCase 
Before java code will directly use the flag name as the method name.
This change adds funciton to try the best to convert flag name to
camelCase, and then use the camelCase string as the method name in the
generated code.

Bug: 279483816
Test: atest aconfig.test aconfig.test.java
Change-Id: I45fc6df46c9d535cd38a657a41313202f9b660af
 2023-06-16 12:40:40 +00:00
Lokesh Kumar Goel
5f04423ae5 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: d6b38eb87a -s ours am: 04737c1d11 -s ours am: 5b0c29645f -s ours am: 08f34fc2a9 -s ours am: d7b3cf92ce -s ours 
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

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

Change-Id: I20cd9407bb157045a22da9a75b616e46d9d6e6c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 11:39:51 +00:00
Lokesh Kumar Goel
abece25595 [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -s ours am: 846336796d -s ours am: 4c0aa1fcfb -s ours am: 431c2eb92d -s ours am: 3b9c69cc58 -s ours am: 449955ea03 -s ours 
am skip reason: Merged-In Iec37a521c10365635950d6646f57153e7d3e3794 with SHA-1 ba70ed836e is already in history

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

Change-Id: Ic28aee99f1fa383cb75507b5c081879bbcc1b7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 11:39:41 +00:00