StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,050 Commits 1 Branch 0 Tags
b83c3c55ff55fa8539bc3d0cdfc255d94296da9c
Commit Graph

89050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Zhi Dou
cff292f8b2 Merge "aconfig: generate Java flag name constants" 2023-06-20 16:53:53 +00:00
Jiakai Zhang
3737a946a3 Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." am: bedc1d3518 am: 9778268c87 am: aaa9e6ac0a am: 2721abe7d4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2629038

Change-Id: Ifde9f89efc3c490ba8097ec42a4881c3a904c410
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 16:46:22 +00:00
Treehugger Robot
6a5ce4a2a9 Merge "aconfig: use proto struct directly" am: 23788f85a4 am: 7639e644a3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628052

Change-Id: Ia06be6b396a9f28f4a672d5767d65198c70f67c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 16:41:44 +00:00
Treehugger Robot
7639e644a3 Merge "aconfig: use proto struct directly" am: 23788f85a4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628052

Change-Id: Ie7a63ce89d02bc3fc4fcee4e3080cc86779a167f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 16:04:25 +00:00
Jiakai Zhang
2721abe7d4 Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." am: bedc1d3518 am: 9778268c87 am: aaa9e6ac0a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2629038

Change-Id: Ia060a7e6d0e8b3008e8345f5f6b9234661e98816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 16:03:11 +00:00
Treehugger Robot
23788f85a4 Merge "aconfig: use proto struct directly" 2023-06-20 15:28:58 +00:00
Jiakai Zhang
aaa9e6ac0a Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." am: bedc1d3518 am: 9778268c87 
Original change: https://android-review.googlesource.com/c/platform/build/+/2629038

Change-Id: I42dc72722af03f968b96f680ac8670077f9e8d76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 15:16:08 +00:00
Jiakai Zhang
9778268c87 Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." am: bedc1d3518 
Original change: https://android-review.googlesource.com/c/platform/build/+/2629038

Change-Id: I02e2fae8e1707fbb11b76bfad7c364527b855bf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 14:38:23 +00:00
Jiakai Zhang
bedc1d3518 Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." 2023-06-20 13:52:04 +00:00
Jooyung Han
8cc42f429f Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES 
We will deprecate flattened apexes. In this change, GSI-specific make
variable (PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES) is removed. The
variable was used to install both image/flattened apexes in the GSI, so
that it works on ro.apex.updatable devices and not-updatable devices.

Now, GSI will have only image APEXes in it.

Bug: 278826656
Test: lunch gsi_arm64-userdebug && m # no flattened apexes
Change-Id: I4702973d4ee75aa693e4e7f4e57577b77059dc09
 2023-06-20 14:27:10 +09:00
Wei Li
5274bcbcdc Merge "Include static libraries information in Android SBOM." am: c20175155a am: 7f298d8a1a am: 98a187fb69 am: 83cdd1f97d am: 55734abd80 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609475

Change-Id: Ifa2359e487edb3f986d543d593756fb1226b2dc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 01:42:07 +00:00
Wei Li
55734abd80 Merge "Include static libraries information in Android SBOM." am: c20175155a am: 7f298d8a1a am: 98a187fb69 am: 83cdd1f97d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609475

Change-Id: I9ec9c1f657749b312b881da15d27c37b5f8f7946
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 01:02:49 +00:00
Wei Li
83cdd1f97d Merge "Include static libraries information in Android SBOM." am: c20175155a am: 7f298d8a1a am: 98a187fb69 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609475

Change-Id: I16510d59533dc69cbeeeddaefaba91e691631949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-20 00:19:01 +00:00
Wei Li
98a187fb69 Merge "Include static libraries information in Android SBOM." am: c20175155a am: 7f298d8a1a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609475

Change-Id: Ic7b8cc18a72785db9b8401ff9f29295512d4a05b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 23:31:21 +00:00
Wei Li
7f298d8a1a Merge "Include static libraries information in Android SBOM." am: c20175155a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2609475

Change-Id: I342757931802a04dd09d0f50e3eea2219fdd5948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 22:51:32 +00:00
Treehugger Robot
4cde8fd597 Merge "Fix usage message." am: fb8c86513e am: 9d9e540cc5 am: 8b1c423839 am: 26fb87e0fd am: dc7284146a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2625356

Change-Id: I48a02b9a69176a050aa30dc36327cbe3b8fc19f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 22:46:15 +00:00
Treehugger Robot
bdd5fb29df Merge "Fix godoc typos." am: d999938ab0 am: 6df5275646 am: b89f8537cc am: 0a12cee3aa am: 1ac1544628 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628611

Change-Id: Idcdbb24e233efbcc383a3411c98baadcd2428980
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 22:45:58 +00:00
Treehugger Robot
dc7284146a Merge "Fix usage message." am: fb8c86513e am: 9d9e540cc5 am: 8b1c423839 am: 26fb87e0fd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2625356

Change-Id: I9dd4de1d53e30b4f5417cb8bc07911c881009a06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 22:04:42 +00:00
Treehugger Robot
1ac1544628 Merge "Fix godoc typos." am: d999938ab0 am: 6df5275646 am: b89f8537cc am: 0a12cee3aa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2628611

Change-Id: Ie4d9a20f5ccf30c56fe09555e0d6da0b6f5db240
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 22:04:28 +00:00
Wei Li
c20175155a Merge "Include static libraries information in Android SBOM." 2023-06-19 22:02:20 +00:00
Treehugger Robot
26fb87e0fd Merge "Fix usage message." am: fb8c86513e am: 9d9e540cc5 am: 8b1c423839 
Original change: https://android-review.googlesource.com/c/platform/build/+/2625356

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

Change-Id: I656792d1b06e40d378b4cbccf39cc1550cf646d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 21:19:03 +00:00
Treehugger Robot
8b1c423839 Merge "Fix usage message." am: fb8c86513e am: 9d9e540cc5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2625356

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

Change-Id: Ib220fc15a0083bfdd821d92ff920eaf84be5b768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-19 20:31:30 +00:00
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