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

95606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Treehugger Robot
fc926cd680 Merge "Support overriding cow version during OTA generation" into main am: 4f3ea9eeb8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2864988

Change-Id: I8a2b905cfdeff1804dbef06d3866e972f7324262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 19:07:17 +00:00
Treehugger Robot
4f3ea9eeb8 Merge "Support overriding cow version during OTA generation" into main 2023-12-12 18:38:29 +00:00
Treehugger Robot
450c25c47e Merge "aconfig: include all tests in TEST_MAPPING" into main am: 83bc504d74 am: 3b122b17ee am: 033f38784c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2870454

Change-Id: I45b94db50a4c0e26af7779525fce204061b3ae7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 15:42:27 +00:00
Treehugger Robot
033f38784c Merge "aconfig: include all tests in TEST_MAPPING" into main am: 83bc504d74 am: 3b122b17ee 
Original change: https://android-review.googlesource.com/c/platform/build/+/2870454

Change-Id: I0bbbf07015e6055c04a7fd2ac0559cd7dc19cb1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 15:09:19 +00:00
Treehugger Robot
3b122b17ee Merge "aconfig: include all tests in TEST_MAPPING" into main am: 83bc504d74 
Original change: https://android-review.googlesource.com/c/platform/build/+/2870454

Change-Id: Ia74cd60c66bcd6da5446d2d8aa811d8687831d28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 14:39:41 +00:00
Treehugger Robot
e5c08a8c57 Merge "aconfig: fix broken test 'aconfig.test.cpp.test_mode:AconfigTest#ResetFlagValue'" into main am: d2a333f691 am: 773c57f5a4 am: ada37d1911 
Original change: https://android-review.googlesource.com/c/platform/build/+/2868579

Change-Id: Ia2619ced848ba97f23ad529550eb1bf9262194d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 14:19:49 +00:00
Treehugger Robot
83bc504d74 Merge "aconfig: include all tests in TEST_MAPPING" into main 2023-12-12 14:07:43 +00:00
Treehugger Robot
ada37d1911 Merge "aconfig: fix broken test 'aconfig.test.cpp.test_mode:AconfigTest#ResetFlagValue'" into main am: d2a333f691 am: 773c57f5a4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2868579

Change-Id: I84caef7945c6233a52013ce89c23fd3513b91ef2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 13:46:51 +00:00
Treehugger Robot
773c57f5a4 Merge "aconfig: fix broken test 'aconfig.test.cpp.test_mode:AconfigTest#ResetFlagValue'" into main am: d2a333f691 
Original change: https://android-review.googlesource.com/c/platform/build/+/2868579

Change-Id: I76473df94cd977755307387d4c61d398b424758d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-12 13:16:54 +00:00
Mårten Kongstad
0ae74f86ba aconfig: include all tests in TEST_MAPPING 
The aconfig tests used to be implicitly run by Treehugger, but something
has changed and Treehugger no longer verifies aconfig uploads. Fix this
by explicitly listing all aconfig tests in the TEST_MAPPING file.

Treehugger does not allow new tests in presubmit before they have proven
themselves (in terms of flakiness and execution speed) in postsubmit.
For this reason this CL adds the tests to postsubmit; a follow-up CL
will move them to presubmit.

This has the added benefit of allowing developers to easily run all
tests locally, either by

  $ atest

if current working directory is build/tools/aconfig or one of its
subdirectories, or

  $ atest --test-mapping $(gettop)/build/tools/aconfig

from anywhere in the Android tree.

Also add all tests to "general-tests" to enable Treehugger to run them.
Move aconfig.test from "device-tests" to "general-tests"; the former
group is intended for tests that depend on device-specific
functionality. See [1] for more info.

1. https://source.android.com/docs/core/tests/development/test-mapping

Bug: N/A
Test: atest --test-mapping $(gettop)/build/tools/aconfig
Change-Id: If857733834c8ad43a16e6162e50e6b1f713f979d
 2023-12-12 14:05:15 +01:00
Treehugger Robot
d2a333f691 Merge "aconfig: fix broken test 'aconfig.test.cpp.test_mode:AconfigTest#ResetFlagValue'" into main 2023-12-12 12:43:00 +00:00
Mårten Kongstad
0bedc1507d aconfig: fix broken test 'aconfig.test.cpp.test_mode:AconfigTest#ResetFlagValue' 
The aconfig.test.cpp.test_mode test cases modify the local flag
overrides, but was not resetting the values between tests. This meant
that

  $ atest 'aconfig.test.cpp.test_mode:AconfigTest#ResetFlagValue'

would succeed, but

  $ atest aconfig.test.cpp.test_mode

would fail. Fix this by calling reset_flags() as part of the per-test
setup.

Bug: N/A
Test: atest aconfig.test.cpp.test_mode
Change-Id: Ic8cffff0deb279b7ae103c05642c67230afc040f
 2023-12-12 10:29:58 +01:00
Wei Li
84359f11f3 Merge "Fix the function invocation which missed the package name." into main am: 35baf405e0 am: f251d3ec11 am: c6105c42a3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2869634

Change-Id: I74df8096c8717524aca17e7c45e523fd99e91e0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 23:36:18 +00:00
Oriol Prieto Gascó
59fce2e273 Merge "aconfig: Respect flag naming convention on test flags" into main am: 13af7616bf am: 97dba65914 am: 1d6738bebd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2868794

Change-Id: Ia205f0c845ec4899c7ea1cc23084d4f6de6675df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 23:34:30 +00:00
Dennis Shen
c263e63ce4 Merge "aconfig: update aconfig cpp integration tests" into main am: 97ae9d35de am: 654831f852 am: e5018e4428 
Original change: https://android-review.googlesource.com/c/platform/build/+/2862453

Change-Id: I196c678d27213057f319003b12acce603d58bf2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 23:30:07 +00:00
George Lin
9e746d2682 Merge "Revert "Fix the KNOWN_CODENAMES to include "L"."" into main am: 7c607a0e32 am: c15097fa2e am: b7d6f8c952 
Original change: https://android-review.googlesource.com/c/platform/build/+/2864057

Change-Id: I614619d59238e2daa098a04b30591a653e6271db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 23:29:03 +00:00
Xin Li
0f85da9cc7 [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 4e1043bfde -s ours am: 63618b692e -s ours am: 49f3ce296d -s ours 
am skip reason: Merged-In I3810ff367d86e26e3a29210caa248867cca31cf0 with SHA-1 c64fa2e2c6 is already in history

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

Change-Id: I8c2af9c3f30ec1fad1c2c6e60791c7694d4221d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 23:01:18 +00:00
Xin Li
8995225938 [automerger skipped] Merge Android 14 QPR1 am: 8b3a0e9ec4 -s ours am: 0b7e350185 -s ours am: 9ec8a562e3 -s ours 
am skip reason: Merged-In I3810ff367d86e26e3a29210caa248867cca31cf0 with SHA-1 c64fa2e2c6 is already in history

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

Change-Id: I1fba3c91fc5ff981e66e37c1d853d074031617e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:57:53 +00:00
Wei Li
c6105c42a3 Merge "Fix the function invocation which missed the package name." into main am: 35baf405e0 am: f251d3ec11 
Original change: https://android-review.googlesource.com/c/platform/build/+/2869634

Change-Id: Ib94a572ed01eb6a2bb4299714f4346352ae045a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:53:22 +00:00
Oriol Prieto Gascó
1d6738bebd Merge "aconfig: Respect flag naming convention on test flags" into main am: 13af7616bf am: 97dba65914 
Original change: https://android-review.googlesource.com/c/platform/build/+/2868794

Change-Id: Ida4a6cc4b1a1edd13ddd260693a4ddab41d7a24f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:51:13 +00:00
Dennis Shen
e5018e4428 Merge "aconfig: update aconfig cpp integration tests" into main am: 97ae9d35de am: 654831f852 
Original change: https://android-review.googlesource.com/c/platform/build/+/2862453

Change-Id: Ic0712f183aaaaf6b5c4bcf335dd5830f76940a0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:49:54 +00:00
George Lin
b7d6f8c952 Merge "Revert "Fix the KNOWN_CODENAMES to include "L"."" into main am: 7c607a0e32 am: c15097fa2e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2864057

Change-Id: I9cac7c3f73010c52913822be2c46a82c8fcc2229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:45:48 +00:00
Wei Li
f251d3ec11 Merge "Fix the function invocation which missed the package name." into main am: 35baf405e0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2869634

Change-Id: I1feae036c584528f2c4fef0b67f646fb1a1a59d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:21:19 +00:00
Xin Li
49f3ce296d [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 4e1043bfde -s ours am: 63618b692e -s ours 
am skip reason: Merged-In I3810ff367d86e26e3a29210caa248867cca31cf0 with SHA-1 c64fa2e2c6 is already in history

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

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