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
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
Xin Li
9ec8a562e3 [automerger skipped] Merge Android 14 QPR1 am: 8b3a0e9ec4 -s ours am: 0b7e350185 -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: Id17f3131e07b89e181217d7587776c60aa0e201b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:02:40 +00:00
Wei Li
35baf405e0 Merge "Fix the function invocation which missed the package name." into main 2023-12-11 21:45:23 +00:00
Oriol Prieto Gascó
97dba65914 Merge "aconfig: Respect flag naming convention on test flags" into main am: 13af7616bf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2868794

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

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

Change-Id: I9d3ae7e7c60d3faa6b7c2fe1acbcde6c3f6b287b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:34:28 +00:00
Xin Li
63618b692e [automerger skipped] Merge "Merge Android 14 QPR1" into main am: 4e1043bfde -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: I954fef08037bcf282320177fab0117f162c2fccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:20:17 +00:00
Xin Li
0b7e350185 [automerger skipped] Merge Android 14 QPR1 am: 8b3a0e9ec4 -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: I6329c53f72d0deae5ad7d9b551bf68eecb600000
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 21:16:51 +00:00
Wei Li
b32ad827c7 Fix the function invocation which missed the package name. 
The issue was introduced in the last refactoring, but the logic using the function is currently not used so nothing is broken.

Bug: 303904827
Test: CIs
Change-Id: I428e5b8d525ec49d0d5f62b7fbcc54caf482ac59
 2023-12-11 12:19:30 -08:00
Oriol Prieto Gascó
13af7616bf Merge "aconfig: Respect flag naming convention on test flags" into main 2023-12-11 18:45:37 +00:00
Oriol Prieto Gasco
bbeda85949 aconfig: Respect flag naming convention on test flags 
Test: atest aconfig.test
Bug: 311152507
Change-Id: I960867d32415007db5dacab57e97b813cbbee650
 2023-12-11 18:45:06 +00:00
Dennis Shen
97ae9d35de Merge "aconfig: update aconfig cpp integration tests" into main 2023-12-11 16:50:03 +00:00
Dennis Shen
813267d1e7 aconfig: update aconfig cpp integration tests 
Note a new cc_test target aconfig.test.cpp.test_mode is added instead of
reusing the old aconfig.test.cpp test target is becuase the test and
production version codegen flag lib has symbol conflict, one should only
link one at a a time.

Bug: b/291068147
Test: atest aconfig.test.cpp/aconfig.test.cpp.test_mode
Change-Id: Ifd52fd6eb7538fba90a13f0a6618a33a69b2358e
 2023-12-11 13:20:12 +00:00
George Lin
7c607a0e32 Merge "Revert "Fix the KNOWN_CODENAMES to include "L"."" into main 2023-12-09 00:13:57 +00:00
Xin Li
4e1043bfde Merge "Merge Android 14 QPR1" into main 2023-12-09 00:11:53 +00:00
George Lin
b30e25376f Revert "Fix the KNOWN_CODENAMES to include "L"." 
This reverts commit c4517b0fbd.

Reason for revert: The CL is considered a culprit of b/315384164

Change-Id: I47479cad38f2337e68e14a5e31bd9bc26d948b94
 2023-12-08 21:45:17 +00:00
Xin Li
8b3a0e9ec4 Merge Android 14 QPR1 
Merged-In: I3810ff367d86e26e3a29210caa248867cca31cf0
Bug: 315507370
Change-Id: Ie16a18d43d04b55670bab2c9a0979a2696ed201a
 2023-12-08 13:13:06 -08:00
Dennis Shen
0d01239d02 Merge "aconfig: update aconfig owners" into main am: 60eeb8578b am: c64fa2e2c6 am: d32db765a4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2863158

Change-Id: I17b988f0bc9b45013a3fb961bf00792ffde73860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 20:53:10 +00:00
Dennis Shen
d32db765a4 Merge "aconfig: update aconfig owners" into main am: 60eeb8578b am: c64fa2e2c6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2863158

Change-Id: Iffddd134816b0aedf7d22cfe371278786f40f68d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 20:21:22 +00:00
Dennis Shen
c64fa2e2c6 Merge "aconfig: update aconfig owners" into main am: 60eeb8578b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2863158

Change-Id: I3810ff367d86e26e3a29210caa248867cca31cf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 19:50:57 +00:00
Dennis Shen
60eeb8578b Merge "aconfig: update aconfig owners" into main 2023-12-08 19:16:00 +00:00
Dennis Shen
102bec338a aconfig: update aconfig owners 
Change-Id: Ie97963c68c789e64495db4ed6e198f17eab412f6
 2023-12-08 19:14:17 +00:00
Treehugger Robot
25fafb3cfe Merge "aconfig: move codegen into separate module" into main am: a18d7b17b7 am: 7c9c3c00ce am: d2b84e5049 
Original change: https://android-review.googlesource.com/c/platform/build/+/2863041

Change-Id: Idef2c472d077c640b0979373f77f3a43087ff7e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 15:55:35 +00:00
Treehugger Robot
d2b84e5049 Merge "aconfig: move codegen into separate module" into main am: a18d7b17b7 am: 7c9c3c00ce 
Original change: https://android-review.googlesource.com/c/platform/build/+/2863041

Change-Id: I4c55f86f75215b5c8876267927f6ff2064fb68a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 15:21:44 +00:00
Treehugger Robot
7c9c3c00ce Merge "aconfig: move codegen into separate module" into main am: a18d7b17b7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2863041

Change-Id: Id17e69e5565065184b9a173d6b9502de6df724df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 14:51:47 +00:00
Ankur Bakshi
0cb28bd33e [automerger skipped] RESTRICT AUTOMERGE Update Security String to 2024-02-05 am: e4a65557e4 -s ours am: d309a50208 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8e9b7d1ac7f9c5e14ff7be1ccdd7553781bde18e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-08 14:32:58 +00:00
Treehugger Robot
a18d7b17b7 Merge "aconfig: move codegen into separate module" into main 2023-12-08 14:15:51 +00:00