Commit Graph

37984 Commits

Author SHA1 Message Date
Android Build Coastguard Worker
552acba2a8 Make change and version bump to AP4A.240917.001
Snap for 12373988 from ef48beb370 to 24Q4-release

Change-Id: Ib2e694ac4f8fbf035f63b9dd04646bb03db432ff
2024-09-16 23:45:22 +00:00
Android Build Coastguard Worker
85e0efc049 Version bump to AP4A.240916.002 [core/build_id.mk]
Change-Id: I3db85c122f8464e1c896bd844a46084a7cd24e61
2024-09-16 14:50:23 +00:00
Android Build Coastguard Worker
13fa082e60 Make change and version bump to AP4A.240916.001
Snap for 12370552 from ab5cf0d02d to 24Q4-release

Change-Id: I7617ccae873d8302de4165c19e8470ec0eba8e31
2024-09-15 21:45:16 +00:00
Android Build Coastguard Worker
42e87922b4 Make change and version bump to AP4A.240915.001
Snap for 12369952 from ab5cf0d02d to 24Q4-release

Change-Id: Ib92e151b025c642665879cd68d66eba658ba781a
2024-09-14 23:20:10 +00:00
Android Build Coastguard Worker
b38dffb13a Make change and version bump to AP4A.240914.001
Snap for 12368321 from 4bd215d9e0 to 24Q4-release

Change-Id: I03b356de86d4bd572d894a4de9f26e3479339065
2024-09-14 01:45:23 +00:00
Jeongik Cha
ab5cf0d02d Merge "Use Soong-defined system image's artifacts in target_files.zip" into main am: 5d7cbb6579 am: 01d8a58381
Original change: https://android-review.googlesource.com/c/platform/build/+/3261782

Change-Id: Ic5c21a00bba7786d7c7320d45e3948500c36ddf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-14 00:11:48 +00:00
Jeongik Cha
5d7cbb6579 Merge "Use Soong-defined system image's artifacts in target_files.zip" into main 2024-09-13 23:29:12 +00:00
Dennis Shen
1760706461 Merge "Treat system_ext as system in container designation" into main am: 6940b7898d am: b0d8105009
Original change: https://android-review.googlesource.com/c/platform/build/+/3261300

Change-Id: I2fa3f3306cd29b7d730020fd015930dfbc899f7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-13 02:20:12 +00:00
Android Build Coastguard Worker
f417de32d4 Version bump to AP4A.240913.002 [core/build_id.mk]
Change-Id: If2d8614893cfce1971a475cf2407ab88136c9df1
2024-09-13 00:35:12 +00:00
Android Build Coastguard Worker
66ab2da7b8 Make change and version bump to AP4A.240913.001
Snap for 12361654 from 905172ddc7 to 24Q4-release

Change-Id: I192cc574a989ef364663496a02f64c42825dee9a
2024-09-12 23:44:02 +00:00
Dennis Shen
b3681ad5c6 Treat system_ext as system in container designation
Bug: b/365135457
Test: m
Change-Id: Iece264cdd49d84ef0e5acccdbcf68059c876395f
2024-09-12 23:32:03 +00:00
Jeongik Cha
83db9510d0 Use Soong-defined system image's artifacts in target_files.zip
To ensure the artifacts is ready, add SOONG_DEFINED_SYSTEM_IMAGE_PATH
as an explict dependency of target_files

Bug: 350599478
Test: m dist
Test: check ninja deps
Change-Id: I7adf5c55a3b52da2bd160f930b6f6f100e648e86
2024-09-12 22:10:44 +09:00
Treehugger Robot
ae8f73bb36 Merge "Move create_root_structure.mk to the dont_bother block." into main am: 435145d063 am: 9188de2042
Original change: https://android-review.googlesource.com/c/platform/build/+/3261781

Change-Id: Ibd01ca93ea60f57f9def2a78005f8b2b3b34d25b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 08:47:38 +00:00
Treehugger Robot
435145d063 Merge "Move create_root_structure.mk to the dont_bother block." into main 2024-09-12 08:29:21 +00:00
Treehugger Robot
e468ef50c3 Merge "Move building bootloader/radio image task to proper place" into main am: c2b351babb am: f00af6db55
Original change: https://android-review.googlesource.com/c/platform/build/+/3261778

Change-Id: Icdcda9c442d1ea2c0f5b8e3722393cea66f1a65d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 07:43:41 +00:00
Treehugger Robot
c2b351babb Merge "Move building bootloader/radio image task to proper place" into main 2024-09-12 07:22:38 +00:00
Treehugger Robot
c170e080a2 Merge "Add a new Soong config variable EMMA_INSTRUMENT" into main am: 1d09815d07 am: 44b86ab2c2
Original change: https://android-review.googlesource.com/c/platform/build/+/3247731

Change-Id: Ib4c6f9e8bd8d7c5da59a00c5830ecc1dc0bef697
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 03:21:06 +00:00
Treehugger Robot
1d09815d07 Merge "Add a new Soong config variable EMMA_INSTRUMENT" into main 2024-09-12 03:09:24 +00:00
Treehugger Robot
fd552de10e Merge "Add 16K boot image and dtbo image to dependency list of target files" into main am: ec37b55bc8 am: 8206631a1e
Original change: https://android-review.googlesource.com/c/platform/build/+/3264300

Change-Id: I6794d88b3c506d865bd52b3eb66053efd4b8245e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 00:45:12 +00:00
Treehugger Robot
582de92ec0 Merge "Add soong system image configs" into main am: 0908f9d93d am: f1908a5945
Original change: https://android-review.googlesource.com/c/platform/build/+/3235506

Change-Id: I0af137c15a1e7d76e409c1d0301281281a036a1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-12 00:44:33 +00:00
Treehugger Robot
ec37b55bc8 Merge "Add 16K boot image and dtbo image to dependency list of target files" into main 2024-09-12 00:29:16 +00:00
Treehugger Robot
0908f9d93d Merge "Add soong system image configs" into main 2024-09-12 00:25:22 +00:00
Android Build Coastguard Worker
fbabc084d8 Make change and version bump to AP4A.240912.001
Snap for 12354992 from 4d3c8d9c96 to 24Q4-release

Change-Id: I956f46f81b981e8e602e7b38eaf8d4eea61648a0
2024-09-11 23:45:14 +00:00
Kelvin Zhang
8ac5145307 Add 16K boot image and dtbo image to dependency list of target files
In aosp/3236458 these two artifacts are added to target-files.zip, but
they are not listed as dependency of target-files.zip. Depending on
build order and clean spec, sometimes this leads to missing files.

Test: th
Change-Id: I70e3b3691e77112c2427d95930b0c27a8042884b
2024-09-11 16:31:06 -07: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
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
edb3ba3ae4 Merge "Add missing vendor_kernel_ramdisk dependency to target-files.zip" into main 2024-09-11 20:33:35 +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
Android Build Coastguard Worker
bfa77c3299 Version bump to AP4A.240911.002 [core/build_id.mk]
Change-Id: Ib012e27cc810947ad549b876cf8755ee61763231
2024-09-11 17:33:04 +00:00
Nelson Li
87ef4b8aee Move create_root_structure.mk to the dont_bother block.
Bug: 353642907
Test: m -j init.environ.rc
Change-Id: I54671a194dbf2005286cb8386cafd93fbef75975
2024-09-11 16:46:45 +08:00
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
Herbert Xue
48ab2f75c2 Move building bootloader/radio image task to proper place
Move the task of building bootloader/radio images and unpack their
partitions to build/core/tasks/tools.

Bug: 359426542
Test: presubmit
Change-Id: I3ac1a1a6eb0e21fb1eac6db628e094a13c9fc73f
2024-09-11 10:04:16 +08: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
963298af97 Merge "Move the creation of the root structure to build/core/main.mk" into main 2024-09-11 01:01:40 +00:00
Android Build Coastguard Worker
ed6940c72a Make change and version bump to AP4A.240911.001
Snap for 12348750 from ff18b719e4 to 24Q4-release

Change-Id: I1f277b7768d187cfdc380163e8d322b1dc327dde
2024-09-10 23:45:42 +00: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
f4053ef8c0 Merge "Remove BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" into main 2024-09-10 19:33:04 +00:00
Android Build Coastguard Worker
1ee8759a2d Version bump to AP4A.240910.002 [core/build_id.mk]
Change-Id: I39dc83c5d972ab679afcfc1df365897d629dccd7
2024-09-10 16:46:02 +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
Android Build Coastguard Worker
cceaa93a86 Make change and version bump to AP4A.240910.001
Snap for 12342105 from c7bdc727e1 to 24Q4-release

Change-Id: I96218a6267fe2a9b44c57a3e17e978d7d81ed619
2024-09-09 23:45:13 +00:00
Android Build Coastguard Worker
9cc12919f8 Version bump to AP4A.240909.002 [core/build_id.mk]
Change-Id: I1db278bb9064c732318351d49f0263b5ee4752a9
2024-09-09 14:38:52 +00:00
Android Build Coastguard Worker
dc29a0e828 Make change and version bump to AP4A.240909.001
Snap for 12337991 from e84bceefd1 to 24Q4-release

Change-Id: Id430304fa387ab971e28fff16e018e46d5a5c435
2024-09-08 21:44:49 +00:00
Android Build Coastguard Worker
7dc2ba0760 Make change and version bump to AP4A.240908.001
Snap for 12337246 from e84bceefd1 to 24Q4-release

Change-Id: I3336b33329d8169aa95da7984601d6ef7006dd33
2024-09-07 21:45:06 +00:00
Android Build Coastguard Worker
6b41f2a712 Make change and version bump to AP4A.240907.001
Snap for 12335440 from 8017fc69f4 to 24Q4-release

Change-Id: Iad8d3bf86062f338b0062e3414f73e54c5981a56
2024-09-07 03:15:06 +00:00
Xin Li
7c11265724 Merge "Merge 24Q3 to AOSP main" into main 2024-09-07 01:12:23 +00:00
Android Build Coastguard Worker
9e9e98fad2 Version bump to AP4A.240906.002 [core/build_id.mk]
Change-Id: Ifaa6cd1e5afe4218becdc42c5fb393808d00821f
2024-09-06 18:41:13 +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