Commit Graph

100519 Commits

Author SHA1 Message Date
Kelvin Zhang
06b08b0369 Merge "Fix OTA package re-sign on release key servers" into main am: 278f34add3 am: 677627cbde
Original change: https://android-review.googlesource.com/c/platform/build/+/3263774

Change-Id: I59690676ff534103add111dbca4885127f34baed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 00:24:23 +00:00
Kelvin Zhang
677627cbde Merge "Fix OTA package re-sign on release key servers" into main am: 278f34add3
Original change: https://android-review.googlesource.com/c/platform/build/+/3263774

Change-Id: If116f5f8843adf02fefc97c1d75ac9f83b6bd6d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 00:13:03 +00:00
Kelvin Zhang
278f34add3 Merge "Fix OTA package re-sign on release key servers" into main 2024-09-12 00:09:00 +00:00
Kelvin Zhang
4837944712 Fix OTA package re-sign on release key servers
Release key signing passes more args than just --package_key, honor
these flags properly in signing script.

Test: th
Bug: 354019928
Change-Id: I49215e92f28da2ac4cd72fb9e5c6bbc94a3e3f02
2024-09-11 16:07:04 -07:00
Treehugger Robot
13120197d4 Merge "Add flag for enabling only new storage and use in aflags" into main am: 44bebf7ccb am: aac4eae6d7
Original change: https://android-review.googlesource.com/c/platform/build/+/3263578

Change-Id: I2abd3e20938f8701909f7047ee8911b1b102939a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 22:18:12 +00:00
Treehugger Robot
e8d128c350 Merge "Move copy destination to "sts-sdk"" into main am: 6fbebd4570 am: 3d9f7146e4
Original change: https://android-review.googlesource.com/c/platform/build/+/3254921

Change-Id: I31a53129e713703540a62a86eed2439d7ada5a67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 22:15:00 +00:00
Treehugger Robot
aac4eae6d7 Merge "Add flag for enabling only new storage and use in aflags" into main am: 44bebf7ccb
Original change: https://android-review.googlesource.com/c/platform/build/+/3263578

Change-Id: I5339ef58855497d11990a2d02645ea3ed659149b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 22:05:06 +00:00
Treehugger Robot
3d9f7146e4 Merge "Move copy destination to "sts-sdk"" into main am: 6fbebd4570
Original change: https://android-review.googlesource.com/c/platform/build/+/3254921

Change-Id: I37af4bc9fc5d1dcc876d99e8b024cb50840dd4ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 22:04:51 +00:00
Treehugger Robot
44bebf7ccb Merge "Add flag for enabling only new storage and use in aflags" into main 2024-09-11 21:58:52 +00:00
Treehugger Robot
6fbebd4570 Merge "Move copy destination to "sts-sdk"" into main 2024-09-11 21:58:14 +00:00
Treehugger Robot
c592fca2a3 Merge "Add missing vendor_kernel_ramdisk dependency to target-files.zip" into main am: edb3ba3ae4 am: 03fba52422
Original change: https://android-review.googlesource.com/c/platform/build/+/3260543

Change-Id: Ia3e7900966675813cdbb678f2dc6350e348275c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 20:53:21 +00:00
Treehugger Robot
03fba52422 Merge "Add missing vendor_kernel_ramdisk dependency to target-files.zip" into main am: edb3ba3ae4
Original change: https://android-review.googlesource.com/c/platform/build/+/3260543

Change-Id: I19e9c9c319800c733608ad95346dbc0f2df3fc4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 20:42:49 +00:00
Treehugger Robot
edb3ba3ae4 Merge "Add missing vendor_kernel_ramdisk dependency to target-files.zip" into main 2024-09-11 20:33:35 +00:00
Ted Bauer
b1edaae899 Add flag for enabling only new storage and use in aflags
Change-Id: I73218de38d005d77987d5103364a102cec3abc07
Test: m && cargo t
Bug: 324436145
2024-09-11 20:24:47 +00:00
Luca Farsi
4d3c8d9c96 Merge "Refactor package_outputs" into main am: b5484c4b5b am: 45fba22b56
Original change: https://android-review.googlesource.com/c/platform/build/+/3261359

Change-Id: I99ac964157287844d12e5db9ea9b2b241b5d1d81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 18:19:54 +00:00
Luca Farsi
45fba22b56 Merge "Refactor package_outputs" into main am: b5484c4b5b
Original change: https://android-review.googlesource.com/c/platform/build/+/3261359

Change-Id: I5572cb8552793f533ed8490b4bbcdda4af30949e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 18:11:08 +00:00
Luca Farsi
b5484c4b5b Merge "Refactor package_outputs" into main 2024-09-11 18:05:27 +00:00
Colin Cross
757d8cb7fd Add missing vendor_kernel_ramdisk dependency to target-files.zip
The rule that builds target-files.zip has no dependency on the
vendor_kernel_ramdisk image, which means the files in that image
may not be in place when target-filse.zip is built, causing a
build error:
mkbootfs: cannot open directory '/mnt/disks/build-disk/src/googleplex-android/aosp-main-future-without-vendor/out/target/product/cheetah/obj/PACKAGING/target_files_intermediates/aosp_cheetah-target_files/VENDOR_KERNEL_BOOT/RAMDISK': No such file or directory

Add the missing dependency.

Bug: 365887100
Test: none
Flag: EXEMPT bugfix
Change-Id: I5cdec9bbb35970e4d5e27a6b10ad118ce11835a9
2024-09-11 11:03:36 -07:00
Treehugger Robot
0af3dd86be Merge "Move the creation of the root structure to build/core/main.mk" into main am: 963298af97 am: 2af5d1063f
Original change: https://android-review.googlesource.com/c/platform/build/+/3261773

Change-Id: I4ae21b49d5963f10c3c554d10b7b09e80fbd6633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 01:15:14 +00:00
Treehugger Robot
2af5d1063f Merge "Move the creation of the root structure to build/core/main.mk" into main am: 963298af97
Original change: https://android-review.googlesource.com/c/platform/build/+/3261773

Change-Id: Ia48ed90bf14c89f1e8209cf8ec29f2349adf8886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-11 01:05:06 +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
Luca Farsi
d4e4b64eeb Refactor package_outputs
Refactor package_outputs in the TestOptimizer so it just returns a list
of soong_zip commands to be run by build_test_suites.

Since we already have a tested implementation for running subprocesses
in build_test_suites.py there's no reason to reimplement it in
optimized_targets.py. Because any packaging will ultimately use
soong_zip to package its final outputs change the code to just do
whatever prep it needs to and return a list of soong_zip commands.

This way the code is simpler to test without requiring subprocesses and
no reimplementation of subprocess running code is necessary.

Test: atest build_test_suites_test; atest optimized_targets_test
Bug: 358215235
Change-Id: I3025aefeeb7186f537266a72d8422211ca9835ba
2024-09-10 16:37:51 -07:00
Kelvin Zhang
db2a463588 Merge "Specify tooling dependency for create_brick_ota" into main am: e1f224cd4f am: f481291495
Original change: https://android-review.googlesource.com/c/platform/build/+/3261046

Change-Id: I9ca7d13e276786dfebefe5bdd2f72f342ae9b816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-10 23:12:46 +00:00
Kelvin Zhang
f481291495 Merge "Specify tooling dependency for create_brick_ota" into main am: e1f224cd4f
Original change: https://android-review.googlesource.com/c/platform/build/+/3261046

Change-Id: I45419dff750e030eca4885daa01e79ebfedc77c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-10 23:03:05 +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
ff18b719e4 Merge "Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" into main am: f4053ef8c0 am: c98308a9e7
Original change: https://android-review.googlesource.com/c/platform/build/+/3261335

Change-Id: I10018cfeeda7531b925b99d1c3f9b2e9eec43cf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-10 19:42:33 +00:00
Cole Faust
c98308a9e7 Merge "Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" into main am: f4053ef8c0
Original change: https://android-review.googlesource.com/c/platform/build/+/3261335

Change-Id: I1cfdffbea954380771b367721fd7592b31ce2b84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-10 19:34:15 +00: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
c7bdc727e1 Merge "Fix missing dir error for certain targets" into main am: f5a82529c2 am: 020ac6ea5c
Original change: https://android-review.googlesource.com/c/platform/build/+/3260552

Change-Id: Icb9893f8661fd349f73984595fc6c75868af4fb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-09 19:28:45 +00:00
Treehugger Robot
020ac6ea5c Merge "Fix missing dir error for certain targets" into main am: f5a82529c2
Original change: https://android-review.googlesource.com/c/platform/build/+/3260552

Change-Id: Ic235be07bff24f310ee5d540cfc37d8f00021229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-09 19:18:43 +00: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
e84bceefd1 [automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 7c11265724 -s ours am: deff962534 -s ours
am skip reason: Merged-In I3e2152d0e109ecc6c89c249dea678afc93faf62b with SHA-1 3d9c9aacdb is already in history

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

Change-Id: Ic5bfb8492eb298ecf99e957608d9c0e80d148e4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 03:33:08 +00:00
Xin Li
1eda53a04c [automerger skipped] Merge 24Q3 to AOSP main am: 5ca18247dc -s ours am: ccba671296 -s ours
am skip reason: Merged-In I3e2152d0e109ecc6c89c249dea678afc93faf62b with SHA-1 3d9c9aacdb is already in history

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

Change-Id: I8448b1b8d34600e2eee807ade209029406f7462a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 03:33:02 +00:00
Xin Li
deff962534 [automerger skipped] Merge "Merge 24Q3 to AOSP main" into main am: 7c11265724 -s ours
am skip reason: Merged-In I3e2152d0e109ecc6c89c249dea678afc93faf62b with SHA-1 3d9c9aacdb is already in history

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

Change-Id: I352f197f993198591299cb348065cd555c38350a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 03:02:13 +00:00
Xin Li
ccba671296 [automerger skipped] Merge 24Q3 to AOSP main am: 5ca18247dc -s ours
am skip reason: Merged-In I3e2152d0e109ecc6c89c249dea678afc93faf62b with SHA-1 3d9c9aacdb is already in history

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

Change-Id: I0e26fec994611986f7226620e4e5ab49dc20cb27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-07 03:02:08 +00:00
Xin Li
7c11265724 Merge "Merge 24Q3 to AOSP main" into main 2024-09-07 01:12:23 +00:00
Treehugger Robot
8017fc69f4 Merge "Create parent directories before writing to output target files" into main am: 611bbbc49d am: dd56dc161b
Original change: https://android-review.googlesource.com/c/platform/build/+/3255204

Change-Id: I14579a5c9f3d6313883a45f5d93aa16723e49874
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 23:21:43 +00:00
Treehugger Robot
dd56dc161b Merge "Create parent directories before writing to output target files" into main am: 611bbbc49d
Original change: https://android-review.googlesource.com/c/platform/build/+/3255204

Change-Id: Id58a0e5da52a5151e8f42c299a3390c3a28a5967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 23:00:13 +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
d162dc537f Merge "Add script that dumps all product config varaibles." into main am: 492eea80d9 am: 05e7851be9
Original change: https://android-review.googlesource.com/c/platform/build/+/3247887

Change-Id: I8261148b0351e190799f762615c06b22e624ecc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 18:15:28 +00:00
Treehugger Robot
05e7851be9 Merge "Add script that dumps all product config varaibles." into main am: 492eea80d9
Original change: https://android-review.googlesource.com/c/platform/build/+/3247887

Change-Id: I416e0c6697ca47dc55028fdd90ed28aa361a9b55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 18:04:41 +00: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
ee7c14dc15 Merge "Revert "Revert "Export variable to soong for converting vintf_co..."" into main am: 86514e58df am: a7626f7998
Original change: https://android-review.googlesource.com/c/platform/build/+/3256525

Change-Id: Iccf78f65821902f9ff62c7d11ecbea2664c2d416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 01:03:27 +00:00
Treehugger Robot
a7626f7998 Merge "Revert "Revert "Export variable to soong for converting vintf_co..."" into main am: 86514e58df
Original change: https://android-review.googlesource.com/c/platform/build/+/3256525

Change-Id: I0c68673fed567ef5b33bb73868eda44795a644d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-06 00:53:23 +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