StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,630 Commits 1 Branch 0 Tags
fa68dcace6ac6a81cdacc2b39233c63eec1ecf6c
Commit Graph

95630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
fa68dcace6 Merge changes from topic "aconfig-codegen-ownership" into main am: ca2175d3af am: d095d94ff8 am: a4fbccf173 
Original change: https://android-review.googlesource.com/c/platform/build/+/2877856

Change-Id: Ia47775743503e4c9fa68092de96aa6686b50fc1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 17:04:47 +00:00
Treehugger Robot
a4fbccf173 Merge changes from topic "aconfig-codegen-ownership" into main am: ca2175d3af am: d095d94ff8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2877856

Change-Id: I4bd86b8b52f71425be670119b724c32707157d40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 16:33:18 +00:00
Treehugger Robot
d095d94ff8 Merge changes from topic "aconfig-codegen-ownership" into main am: ca2175d3af 
Original change: https://android-review.googlesource.com/c/platform/build/+/2877856

Change-Id: I8bad265a519f5d44463f1852e72115860a36aa63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-15 16:05:02 +00:00
Treehugger Robot
ca2175d3af Merge changes from topic "aconfig-codegen-ownership" into main 
* changes:
  aconfig: pass ownership of ProtoParsedFlag items to Java codegen
  aconfig: pass ownership of ProtoParsedFlag items to C++ codegen
  aconfig: pass ownership of ProtoParsedFlag items to Rust codegen
 2023-12-15 15:24:39 +00:00
Dmitrii Merkurev
aa069668d3 Merge "Revert "Revert "Allow to override fastboot-info.txt for specific..."" into main am: ecabf893a0 am: 9f2bf543b9 am: fd02c7660b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2875335

Change-Id: Iac8bba0df1f95b6aa7f8978097b422d19bfcb85f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 19:55:38 +00:00
Treehugger Robot
e4b265321a Merge "Update go.mod to 1.21" into main am: 9e4744383a am: 9e59d40c2c am: d7930f7cc0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2874720

Change-Id: Idd7d4f6d9263c5dc9fd82f55937815b0965b3cd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 19:55:19 +00:00
Dmitrii Merkurev
fd02c7660b Merge "Revert "Revert "Allow to override fastboot-info.txt for specific..."" into main am: ecabf893a0 am: 9f2bf543b9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2875335

Change-Id: I55053bfb8aea3d40a607a6ea28b53c9785137ecf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 19:22:43 +00:00
Treehugger Robot
d7930f7cc0 Merge "Update go.mod to 1.21" into main am: 9e4744383a am: 9e59d40c2c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2874720

Change-Id: Ic556800cda077fe792a89e6272624932b9dbcef5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 19:22:29 +00:00
Dmitrii Merkurev
9f2bf543b9 Merge "Revert "Revert "Allow to override fastboot-info.txt for specific..."" into main am: ecabf893a0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2875335

Change-Id: I10308a23981849cc02710afb837dd4dfabf10ffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 19:03:49 +00:00
Treehugger Robot
9e59d40c2c Merge "Update go.mod to 1.21" into main am: 9e4744383a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2874720

Change-Id: Ibf09b603acc3330155dd8cd90f502845a524357d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-14 19:03:30 +00:00
Dmitrii Merkurev
ecabf893a0 Merge "Revert "Revert "Allow to override fastboot-info.txt for specific..."" into main 2023-12-14 18:57:06 +00:00
Treehugger Robot
9e4744383a Merge "Update go.mod to 1.21" into main 2023-12-14 18:46:11 +00:00
Jeongik Cha
0be07c2279 Update go.mod to 1.21 
because it requires android/soong which uses go 1.21
Bug: 3141333041
Test: go test ./...
Change-Id: I184e6165beafab337b09cd87fd02748e49c65650
 2023-12-14 15:37:35 +00:00
Dmitrii Merkurev
901136e9d8 Revert "Revert "Allow to override fastboot-info.txt for specific..." 
Revert submission 2871792-revert-2871156-fastboot_info-UVHXWCTZZB

Reason for revert: Some images weren't available in Android.mk

Reverted changes: /q/submissionid:2871792-revert-2871156-fastboot_info-UVHXWCTZZB

Bug: 315866782
Test: confirmed bluejay abtd build has correct fastboot-info.txt

Change-Id: Id75d879119744ab97225e5a551e8d32a1b09a356
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
 2023-12-14 13:27:38 +00:00
Mårten Kongstad
0c6a2fac77 aconfig: pass ownership of ProtoParsedFlag items to Java codegen 
Pass ownership of the ProtoParsedFlag iterator items to the Java
codegen: this removes the need for an explicit lifetime annotation.

Bug: N/A
Test: atest aconfig.test
Change-Id: I78705b65b4cf41c3e23b59afbd122a029ee45df4
 2023-12-14 13:56:25 +01:00
Mårten Kongstad
49c49f365a aconfig: pass ownership of ProtoParsedFlag items to C++ codegen 
Pass ownership of the ProtoParsedFlag iterator items to the C++ codegen:
this removes the need for an explicit lifetime annotation.

Bug: N/A
Test: atest aconfig.test
Change-Id: Ic6606a9ab01ddcb61aa668d7ac901469b1e25a1f
 2023-12-14 13:53:52 +01:00
Mårten Kongstad
b7fc0d3e16 aconfig: pass ownership of ProtoParsedFlag items to Rust codegen 
Pass ownership of the ProtoParsedFlag iterator items to the Rust
codegen: this removes the need for an explicit lifetime annotation.

Bug: N/A
Test: atest aconfig.test
Change-Id: Ia37ff9f1238684ea31cda6be70acde54fdb04881
 2023-12-14 13:43:12 +01:00
Harry Cutts
dc8aeb2579 Merge "Include evemu-record command in system image" into main 2023-12-14 11:54:10 +00:00
Zhi Dou
ca421bacaf Merge "aconfig: CodegenMode::Exported: only generate code for exported flags" into main am: 3f2432967b am: 6fc359725a am: 035f2bcdf1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2873755

Change-Id: Ifcc6be47e5b4357dd62619404a7bbd17eddda5b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 22:50:41 +00:00
Zhi Dou
035f2bcdf1 Merge "aconfig: CodegenMode::Exported: only generate code for exported flags" into main am: 3f2432967b am: 6fc359725a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2873755

Change-Id: I1e9395929edffc88fdb0e7ed2e62dab9ec83e0ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 22:17:44 +00:00
Zhi Dou
6fc359725a Merge "aconfig: CodegenMode::Exported: only generate code for exported flags" into main am: 3f2432967b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2873755

Change-Id: I481d6cd1c6646e6251aecc044f843329d2323079
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 21:46:54 +00:00
Zhi Dou
3f2432967b Merge "aconfig: CodegenMode::Exported: only generate code for exported flags" into main 2023-12-13 21:11:15 +00:00
Dan Shi
f877c1c7c4 Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main am: e8519a7bad am: c0d94d179a am: 17391cba39 
Original change: https://android-review.googlesource.com/c/platform/build/+/2871792

Change-Id: I370421e6e101b3e5f078a6a7b86dc745ce7164b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 20:55:05 +00:00
Dan Shi
17391cba39 Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main am: e8519a7bad am: c0d94d179a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2871792

Change-Id: I0a765845255a3eedfb86b0b92c174cbd1fe54d14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 20:23:04 +00:00
Zhi Dou
82df71123a aconfig: CodegenMode::Exported: only generate code for exported flags 
If the codegen mode is CodegenMode::Exported, the codegen should not
generate code including any non-exported flags. This change add a
function to filter the parsed flags before feeding to codegen.

Test: atest aconfig.test aconfig.test.java AconfigJavaHostTest
aconfig.test.cpp aconfig.test.cpp.test_mode aconfig.prod_mode.test.rust
Bug: 311152500

Change-Id: Ia88795bbd13774d02c76d8ab7ef20868149599b5
 2023-12-13 20:02:32 +00:00
Dan Shi
c0d94d179a Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main am: e8519a7bad 
Original change: https://android-review.googlesource.com/c/platform/build/+/2871792

Change-Id: If4a09593a5d072ce82704ea02657407ff64a962d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 19:51:30 +00:00
Dan Shi
e8519a7bad Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main 2023-12-13 19:19:16 +00:00
Harry Cutts
0942f74134 Include evemu-record command in system image 
This command is useful for collecting input events that can then be used
to reproduce bugs or evaluate the quality of input code, for example.

Bug: 302297266
Test: build a system image, check it includes /system/bin/evemu-record
Ignore-AOSP-First: evemu-record is not present in AOSP yet
Change-Id: I21eb7d5dc8cef9c1dd797ba1ab2ee830a8a5a42b
 2023-12-13 19:01:17 +00:00
Dan Shi
16490d3207 Revert "Allow to override fastboot-info.txt for specific board" 
Revert submission 2871156-fastboot_info

Reason for revert: possble cause of b/315866782

Reverted changes: /q/submissionid:2871156-fastboot_info

Change-Id: I07baf20bd50529a36f2841350a24ba58d480f5e2
 2023-12-13 18:58:49 +00:00
Dmitrii Merkurev
d63d6a7adb Merge "Allow to override fastboot-info.txt for specific board" into main am: aaf82ff626 am: 47abe8a42e am: a2191b0e4a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2871235

Change-Id: I607579e81d21af5982fc247bda504e245b84a128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 04:25:17 +00:00
Dmitrii Merkurev
a2191b0e4a Merge "Allow to override fastboot-info.txt for specific board" into main am: aaf82ff626 am: 47abe8a42e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2871235

Change-Id: I9d11637bddf26fc2687fc494656d3e5d7b6afdab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 03:52:44 +00:00
Dmitrii Merkurev
47abe8a42e Merge "Allow to override fastboot-info.txt for specific board" into main am: aaf82ff626 
Original change: https://android-review.googlesource.com/c/platform/build/+/2871235

Change-Id: I5558bf2d98cf74f7d14d32ea82c1fd4aa3cd7c56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 03:03:26 +00:00
Dmitrii Merkurev
aaf82ff626 Merge "Allow to override fastboot-info.txt for specific board" into main 2023-12-13 02:56:12 +00:00
Dennis Shen
3f8bba2bd0 Merge "aconfig: add create storage command" into main am: 728fe988d8 am: 0d4c6cafca am: d54e79e7ef 
Original change: https://android-review.googlesource.com/c/platform/build/+/2855807

Change-Id: If7126d48c8602ec591bf64782c6f220e86fc02b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 00:50:39 +00:00
Dennis Shen
d54e79e7ef Merge "aconfig: add create storage command" into main am: 728fe988d8 am: 0d4c6cafca 
Original change: https://android-review.googlesource.com/c/platform/build/+/2855807

Change-Id: I61d224f38c10718e40402ab96815508c8da62de8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 00:14:27 +00:00
Dennis Shen
0d4c6cafca Merge "aconfig: add create storage command" into main am: 728fe988d8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2855807

Change-Id: I3f1519e6ca646722db552c173a0ee2ead8a1219e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 23:44:46 +00:00
Ted Bauer
8e0515f97b Merge "aconfig: fix template bug in exported mode." into main am: a27d46c590 am: cab7e07de4 am: fef8de03ab 
Original change: https://android-review.googlesource.com/c/platform/build/+/2863216

Change-Id: Ic39434c24064a9677620e0e3117342cc44583dfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 23:29:28 +00:00
Dennis Shen
728fe988d8 Merge "aconfig: add create storage command" into main 2023-12-12 23:15:59 +00:00
Ted Bauer
fef8de03ab Merge "aconfig: fix template bug in exported mode." into main am: a27d46c590 am: cab7e07de4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2863216

Change-Id: If56532e0149974788f74502f70ee6ce3fa4ec279
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 22:21:16 +00:00
Dmitrii Merkurev
21eeb06291 Allow to override fastboot-info.txt for specific board 
Introduce TARGET_BOARD_FASTBOOT_INFO_FILE to override
fastboot-info.txt generated by default

Test: locally with CF target on related change
Bug: 315811289
Change-Id: I52208e49ac1dfe8558849be9befa60df805665e3
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
 2023-12-12 22:10:32 +00:00
Ted Bauer
cab7e07de4 Merge "aconfig: fix template bug in exported mode." into main am: a27d46c590 
Original change: https://android-review.googlesource.com/c/platform/build/+/2863216

Change-Id: I9cbf871f21ec0e66cea325c83b7579b72d523997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 21:50:37 +00:00
Julie Pan
9925a3a820 Merge "Remove lberki@google.com from OWNERS" into main am: 6fd71de5a1 am: 4ea87c4b64 am: 5d2445d747 
Original change: https://android-review.googlesource.com/c/platform/build/+/2853992

Change-Id: I72e2eead9342cfd8ebbbd7b881a6c6f95defcde8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 21:48:05 +00:00
Dennis Shen
0d1c5629f7 aconfig: add create storage command 
Add a new aconfig command called create-storage which takes a number
of aconfig cache files that belong to a specific container and produces
storage files.

Add a new module called storage (src/storage/mod.rs) as the entry point
of storage files generation. FlagPackage struct is defined as an
intermediate data structure that will be used to drive all storage files creation.

Add a unit test to lock down FlagPackage creation behaviors.

Bug: b/312243587
Test: atest aconfig.test

Change-Id: Ia7e9f68237ea903f295ac7891c923f6a39f3422d
 2023-12-12 21:46:57 +00:00
Julie Pan
5d2445d747 Merge "Remove lberki@google.com from OWNERS" into main am: 6fd71de5a1 am: 4ea87c4b64 
Original change: https://android-review.googlesource.com/c/platform/build/+/2853992

Change-Id: Iebae2c126a8cb5e5c0e4d266d25ed4b3bc4c6748
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 20:57:26 +00:00
Ted Bauer
a27d46c590 Merge "aconfig: fix template bug in exported mode." into main 2023-12-12 20:47:19 +00:00
Julie Pan
4ea87c4b64 Merge "Remove lberki@google.com from OWNERS" into main am: 6fd71de5a1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2853992

Change-Id: Ic34fb1387c82766c949dcddb9ec934492a118613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 20:26:44 +00:00
Treehugger Robot
e438f967ff Merge "Support overriding cow version during OTA generation" into main am: 4f3ea9eeb8 am: fc926cd680 am: 8e1d4fb41b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2864988

Change-Id: I2e44164f0828d997e47c3ccb7acfdc79f873f45e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 20:10:36 +00:00
Julie Pan
6fd71de5a1 Merge "Remove lberki@google.com from OWNERS" into main 2023-12-12 19:48:16 +00:00
Ted Bauer
98562fded9 aconfig: fix template bug in exported mode. 
FakeFeatureFlagsImpl still generated all flags in its mFlagMap field, but it should generate only exported flags in exported mode.

Test: atest aconfig.test.java
Bug: 311152507
Change-Id: I61843cd87b3bb5035772791a5869a91b07d574d8
 2023-12-12 14:42:45 -05:00
Treehugger Robot
8e1d4fb41b Merge "Support overriding cow version during OTA generation" into main am: 4f3ea9eeb8 am: fc926cd680 
Original change: https://android-review.googlesource.com/c/platform/build/+/2864988

Change-Id: I525dae69a74f38938beebd76e0cad3c8447e9467
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 19:34:59 +00:00