StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,179 Commits 1 Branch 0 Tags
aaa9e6ac0a3f56816ddbba5f02e043dba291941c
Commit Graph

85179 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Wei Li
c20175155a Merge "Include static libraries information in Android SBOM." 2023-06-19 22:02:20 +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
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
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
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
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
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
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
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
54123493ce [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 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: I7ccfbb2bdd07af0317f12eedd615040aa3ede87f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 10:04:41 +00:00
Lokesh Kumar Goel
04737c1d11 [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 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: I39edfd1ead48eb174013e8258cf000fe428522c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 09:24:43 +00:00
Lokesh Kumar Goel
d6b38eb87a [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 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: I53c1a42baef3d8ca94b676db965461e7281f923d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 08:39:56 +00:00
Lokesh Kumar Goel
846336796d [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -s ours am: fa43562ebf -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: Ie43851fd2e91738ec9efc8e16cb8d66eece6250b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 08:12:07 +00:00
Jooyung Han
da705680d7 Merge "Remove --blkid_path argument" am: e4635b3e04 am: 4941f6fd47 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624574

Change-Id: Ia86ed1a4ab746e17237156d6e2832785c4bfdf8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 08:11:35 +00:00
Lokesh Kumar Goel
fa43562ebf [automerger skipped] Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 am: 6e8c32b58f -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: I61f0420c24c9853b4339577d517325207bd01044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 07:32:20 +00:00
Jooyung Han
4941f6fd47 Merge "Remove --blkid_path argument" am: e4635b3e04 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624574

Change-Id: Icb064093d587479713e7da5bd670d4cb36f977a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 07:30:28 +00:00
Lokesh Kumar Goel
6e8c32b58f Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 am: bd58a9d5b7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: Ie8ce56f52a660d20afb4575fff30dbc112cf72df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 06:55:00 +00:00
Jooyung Han
e4635b3e04 Merge "Remove --blkid_path argument" 2023-06-16 06:48:57 +00:00
Lokesh Kumar Goel
bd58a9d5b7 Update Security String to 2023-08-01 am: 85adf2e404 am: e4e40fc164 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: I4977b1c2f3b0eab8a45fd46e9bb1698dd5a80a86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 06:11:46 +00:00
Lokesh Kumar Goel
e4e40fc164 Update Security String to 2023-08-01 am: 85adf2e404 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/23554873

Change-Id: Ied32ee5938a7fc5bb382db18866e21473e9d750f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 05:24:22 +00:00
Lokesh Kumar Goel
85adf2e404 Update Security String to 2023-08-01 
Bug: 285692955
Change-Id: I0f39a4929744496beb9641b67055f8900356f995
Merged-In: I137506c673d9f44789c26f88a416c0fd06df02ce
Merged-In: Iec37a521c10365635950d6646f57153e7d3e3794
 2023-06-16 02:11:29 +00:00
Justin Yun
8caeb6494a Merge "Use map_file_generator only for the supported file systems" am: cf92cdff7c am: 514a12d7af 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627751

Change-Id: Ic0dd79a9c49d3927d257a40a824d216acf3916df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 01:16:18 +00:00
Justin Yun
514a12d7af Merge "Use map_file_generator only for the supported file systems" am: cf92cdff7c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627751

Change-Id: I968de85f8e094ec73d7247275ad9c374ddda009b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 00:31:08 +00:00
Justin Yun
cf92cdff7c Merge "Use map_file_generator only for the supported file systems" 2023-06-15 23:54:29 +00:00
Bob Badour
a0b53ceac2 Fix godoc typos. 
Methods got renamed, but the godoc didn't.

Test: m droid dist
Change-Id: Ia1181a2c7a876e54b8cd26ba1c91ce731ba8ac96
 2023-06-15 16:26:21 -07:00
Lokesh Kumar Goel
b3b4b2f300 [automerger skipped] Update Security String to 2023-08-01 am: ba70ed836e am: cbe67a8aff am: c5dbf06e2b -s ours am: ef9ac539af -s ours 
am skip reason: Merged-In I137506c673d9f44789c26f88a416c0fd06df02ce with SHA-1 be93b44331 is already in history

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

Change-Id: I2b9cc1791ed6539ebb3194cd2ad772a9c7ea28ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 23:00:09 +00:00
Lokesh Kumar Goel
ef9ac539af [automerger skipped] Update Security String to 2023-08-01 am: ba70ed836e am: cbe67a8aff am: c5dbf06e2b -s ours 
am skip reason: Merged-In I137506c673d9f44789c26f88a416c0fd06df02ce with SHA-1 be93b44331 is already in history

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

Change-Id: Ie9f6f1725f194fd72d4108bc298abc136d2ba1d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 22:18:11 +00:00