StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
99,983 Commits 1 Branch 0 Tags
c9dd2d5b2e6ad853ed77999ac82a66734fbea075
Commit Graph

99983 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Yun
c9dd2d5b2e Add soong system image configs 
USE_SOONG_DEFINED_SYSTEM_IMAGE is true when the target is using a
system image defined in soong.
PRODUCT_SOONG_DEFINED_SYSTEM_IMAGE is the module name of the soong
defined system image.

Bug: 350599535
Test: lunch aosp_cf_x86_64_phone_soong_system-trunk_staging-userdebug
      && m
Change-Id: Ic5c848fb649a5a61de1a5a253438b2d77d200a6b
 2024-09-11 05:06:42 +00:00
Treehugger Robot
963298af97 Merge "Move the creation of the root structure to build/core/main.mk" into main 2024-09-11 01:01:40 +00:00
Kelvin Zhang
e1f224cd4f Merge "Specify tooling dependency for create_brick_ota" into main 2024-09-10 22:52:05 +00:00
Kelvin Zhang
41d3833a07 Specify tooling dependency for create_brick_ota 
create_brick_ota relies on signapk for OTA package signing, hence
add relevant tools in dependency list.

Bug: 365701163

Change-Id: Ib414a468bc690ee35cc7cae7bc0d3062c89d0bbe
 2024-09-10 14:36:00 -07:00
Cole Faust
f4053ef8c0 Merge "Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" into main 2024-09-10 19:33:04 +00:00
Nelson Li
1646e5c028 Move the creation of the root structure to build/core/main.mk 
Since Soong currently doesn't support the `install_directory`
functionality, `system/core/rootdir/Android.mk` cannot be directly
converted to Android.bp. Moreover, its main content is to create
directories and symlinks for the root file system. Therefore, we'll
first rename it and move it to build/core/main.mk for handling.

In addition, consolidate the handling of meta-lic related parts into
`build/core/tasks/meta-lic.mk`.

Bug: 353642907
Test: m -j init.environ.rc
Change-Id: Ie8f8bcae5752d22c331b33a33981a959410f0a69
 2024-09-10 06:51:10 +00:00
Cole Faust
f72ec7ae1d Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES 
It's been available for over a year, lets progress the python3 migration
by removing it.

Bug: 203436762
Test: Presubmits
Change-Id: I4193767a6a72a527eeca56fbabe477bee9e21c7a
 2024-09-09 18:08:01 -07:00
Treehugger Robot
f5a82529c2 Merge "Fix missing dir error for certain targets" into main 2024-09-09 19:12:32 +00:00
Kelvin Zhang
2427d9d402 Fix missing dir error for certain targets 
Test: th
Bug: 364967828
Change-Id: I31f76533c3e3be63aa55f96be8fd697c4a629e65
 2024-09-09 11:14:53 -07:00
Xin Li
7c11265724 Merge "Merge 24Q3 to AOSP main" into main 2024-09-07 01:12:23 +00:00
Treehugger Robot
611bbbc49d Merge "Create parent directories before writing to output target files" into main 2024-09-06 22:44:14 +00:00
Kelvin Zhang
cc758d9609 Create parent directories before writing to output target files 
Sometimes the output path's parent directory doesn't exist yet,
causing a failure in open() syscall.

Test: sign_target_files_apks solios-target_files-12328286.zip
solis_signed.zip
Bug: 364967828

Change-Id: I85f91ca5d1321c1ba763cac058eb28acc7f48e70
 2024-09-06 14:49:12 -07:00
Treehugger Robot
492eea80d9 Merge "Add script that dumps all product config varaibles." into main 2024-09-06 17:58:16 +00:00
Treehugger Robot
86514e58df Merge "Revert "Revert "Export variable to soong for converting vintf_co..."" into main 2024-09-06 00:48:26 +00:00
Xin Li
5ca18247dc Merge 24Q3 to AOSP main 
Bug: 357762254
Merged-In: I3e2152d0e109ecc6c89c249dea678afc93faf62b
Change-Id: I7162a45227c1bf61bb686b6bacebf4fced8b2c95
 2024-09-05 17:02:34 -07:00
Treehugger Robot
7575a8174b Merge "Reland Support incremental dev option OTA during signing" into main am: 7f9092291f 
Original change: https://android-review.googlesource.com/c/platform/build/+/3257139

Change-Id: I673212e73356136e88b2c64a40c094eddd2113f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 19:01:57 +00:00
Treehugger Robot
7f9092291f Merge "Reland Support incremental dev option OTA during signing" into main 2024-09-05 18:49:29 +00:00
Kelvin Zhang
065c5f5f5b Reland Support incremental dev option OTA during signing 
This allows incremental dev option to be used on release-key devices.
Boot images are signed during the signing process, and hence the dev
option OTAs(which are derivative of boot image) need to be re-generated.
Previously we only re-generate full OTAs, now we support incrementals
too.

Previous land of the CL had a bug where AddDtbo() is called even for
devices which do not have a DTBO partition, causing signing failures.
This reland fixes the issue above by checking "has_dtbo" in
misc_info.txt

Test: th
Bug: 339658378

This reverts commit 29c7842c02.

Change-Id: Ifb080aaa15faf752ab1cff687c54d00290c1bfa6
 2024-09-05 10:50:03 -07:00
Treehugger Robot
baeab42b59 Merge "Fix str/bytes type error in ReplaceOtaKeys" into main am: f54075d5d4 
Original change: https://android-review.googlesource.com/c/platform/build/+/3255473

Change-Id: Icd7a835359eaeee9d96d0c663e9a195dcce884ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 17:30:20 +00:00
Treehugger Robot
f54075d5d4 Merge "Fix str/bytes type error in ReplaceOtaKeys" into main 2024-09-05 17:27:48 +00:00
Joe Onorato
0462cc589b Merge "Add new script for metadata build target" into main am: 502175c0ad 
Original change: https://android-review.googlesource.com/c/platform/build/+/3112939

Change-Id: I1171b175ea72e20e6dfc2ae064782318a53c6368
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 16:44:06 +00:00
Joe Onorato
502175c0ad Merge "Add new script for metadata build target" into main 2024-09-05 16:40:45 +00:00
Bill Yang
01c18ba25c Revert "Revert "Export variable to soong for converting vintf_co..." 
Revert submission 3235656-revert-3195743-compatibility_matrix-KLJOLWYIMW

Reason for revert: The root cause of the break is already be merged. Related changes: ag/29139095, ag/29139608

Reverted changes: /q/submissionid:3235656-revert-3195743-compatibility_matrix-KLJOLWYIMW

Change-Id: I40d9e6c03dd092783e86338a334851a36f5488dd
 2024-09-05 09:22:17 +00:00
Automerger Merge Worker
80c3e721b9 Merge changes from topic "am-510e537a7c34466d8ed3053298cfa958" into main am: 84aefc948e 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Iaa8c952276cc1fb752bdfe1f4a0cba61a67ef08e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:57:12 +00:00
Ziwei Zhang
bcdc8a9615 [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours am: 81d9588d4c -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie7603b90387d5c1a9672ee4d719bdbdbc476d654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:57:07 +00:00
Automerger Merge Worker
98bcae86d6 Merge changes from topic "am-37a6674c47d345d5b8c04c1839d9e0dc" into android15-tests-dev am: ffc71467f0 
Original change: https://android-review.googlesource.com/c/platform/build/+/3198230

Change-Id: Ieda77ff6124ece43382b6f5c4231460eb1b82e03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:56:43 +00:00
Ziwei Zhang
23de46a4dd [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours am: 6032c5082b -s ours 
am skip reason: contains skip directive

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

Change-Id: Iff2d6b0c0f2b3ece8de3fb7436380b54db2cf9f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:56:40 +00:00
Automerger Merge Worker
ffc71467f0 Merge changes from topic "am-37a6674c47d345d5b8c04c1839d9e0dc" into android15-tests-dev 
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 -s ours
 2024-09-05 02:46:32 +00:00
Automerger Merge Worker
84aefc948e Merge changes from topic "am-510e537a7c34466d8ed3053298cfa958" into main 
* changes:
  [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours
  [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 -s ours
 2024-09-05 02:46:29 +00:00
Ziwei Zhang
6032c5082b [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours 
am skip reason: contains skip directive

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

Change-Id: I6bf9215c916aa8a674cfd3fab93d59aa48c26442
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:46:26 +00:00
Ziwei Zhang
74e51c4695 [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 -s ours 
am skip reason: contains skip directive

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

Change-Id: I9f882bb8119e3939c1996523b177712ac55b5a3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:46:22 +00:00
Ziwei Zhang
81d9588d4c [automerger skipped] Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev am: 57fa0d3215 -s ours 
am skip reason: contains skip directive

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

Change-Id: Ie9071e125b35e5fff308004e304af2a51330aa76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:46:20 +00:00
Ziwei Zhang
abbea01558 [automerger skipped] RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. am: 660e2ef531 -s ours 
am skip reason: contains skip directive

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

Change-Id: Idd6a52815413e3ef7b764db58c1d82bcf85c88cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 02:46:13 +00:00
Ziwei Zhang
57fa0d3215 Merge "RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS." into android14-tests-dev 2024-09-05 02:41:06 +00:00
Xin Li
c6809dc621 Merge "Revert "Remove messaging package."" into main am: 444cd45ec7 
Original change: https://android-review.googlesource.com/c/platform/build/+/3255457

Change-Id: Icef65446c6443d7e71028996c40b4e3c88d9d9cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-05 00:33:14 +00:00
Xin Li
444cd45ec7 Merge "Revert "Remove messaging package."" into main 2024-09-05 00:23:44 +00:00
Kelvin Zhang
0c9a6ffb00 Fix str/bytes type error in ReplaceOtaKeys 
ZipFile.read() returns byte sequence, while re.match expects str.
Decode the bytes read first.

Test: th
Bug: 315855025
Change-Id: Id2da071f3caeab56cfac845a9e4f842c4e102f49
 2024-09-04 17:03:24 -07:00
Treehugger Robot
b7c2e20d68 Merge "Don't show container in list new storage" into main am: 9263e3e447 
Original change: https://android-review.googlesource.com/c/platform/build/+/3255342

Change-Id: I9c0c9fbc85c70d081499be8d57f38a5dc9726b2d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 19:33:23 +00:00
Treehugger Robot
9263e3e447 Merge "Don't show container in list new storage" into main 2024-09-04 19:24:25 +00:00
Ted Bauer
c50121613d Don't show container in list new storage 
Change-Id: I24263e244d5b86ef066cd2efd511a890b03bf6e7
Test: m
Bug: 324436145
 2024-09-04 18:11:59 +00:00
Colin Cross
e21cb30040 Merge "Move checkbuild targets of Soong modules into Soong" into main am: d41d4149f6 
Original change: https://android-review.googlesource.com/c/platform/build/+/3236363

Change-Id: I2940228144e026f91f2ef7dc8f4a2355450997b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 17:15:13 +00:00
Colin Cross
d41d4149f6 Merge "Move checkbuild targets of Soong modules into Soong" into main 2024-09-04 17:12:03 +00:00
Priyanka Advani (xWF)
3b6d8085f0 Revert "Remove messaging package." 
Revert submission 3241481-remove-messaging-package

Reason for revert: Droidmonitor created revert due to b/364617310, b/364626927, b/364617560

Reverted changes: /q/submissionid:3241481-remove-messaging-package

Change-Id: I64b5e27f19a46dddd9a6a8c20c6a09367d2a3c18
 2024-09-04 17:03:14 +00:00
Marybeth Fair
27327f5586 Merge "Add a function to fingerprint flag/offset info." into main am: 2610f480aa 
Original change: https://android-review.googlesource.com/c/platform/build/+/3249040

Change-Id: I91bb4dd3a8e2f8105ffdc19264eb92bb9de22653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 15:48:12 +00:00
Marybeth Fair
2610f480aa Merge "Add a function to fingerprint flag/offset info." into main 2024-09-04 15:37:59 +00:00
Elliott Hughes
0967bbdb04 Merge "Remove messaging package." into main am: 8db9956a75 
Original change: https://android-review.googlesource.com/c/platform/build/+/3242200

Change-Id: Ic902392b5ff442e94db6d8fa7341c259b1063ff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 14:13:34 +00:00
Elliott Hughes
8db9956a75 Merge "Remove messaging package." into main 2024-09-04 14:02:00 +00:00
Ziwei Zhang
660e2ef531 RESTRICT AUTOMERGE: Package xTS console into CTS 14 to support MCTS. 
Test: presubmit
Bug: 348121714
Change-Id: I7f24f8f8351966205c5afec2a0b8191266086864
 2024-09-04 07:50:46 +00:00
Treehugger Robot
54ab3cf7b3 Merge "Move COMPATIBILITY.tradefed_tests_dir to proper place" into main am: 6ed53f2e44 
Original change: https://android-review.googlesource.com/c/platform/build/+/3249611

Change-Id: Icc6f1bd00a05d478da2311fa13d909c79868f729
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2024-09-04 04:37:45 +00:00
Treehugger Robot
6ed53f2e44 Merge "Move COMPATIBILITY.tradefed_tests_dir to proper place" into main 2024-09-04 04:27:06 +00:00