Wei Li
486c627e72
Revert "Revert "Add command line tool that generates NOTICE.xml...."
...
Revert submission 3272666-revert-3273112-soong-notice-xml-XKFAUDLTXP
Reason for revert: reland it
Reverted changes: /q/submissionid:3272666-revert-3273112-soong-notice-xml-XKFAUDLTXP
Change-Id: Ica8daafbc5f1bc0bc473c939c595666403349739
2024-09-19 17:55:12 +00:00
Priyanka Advani (xWF)
75501177a5
Merge "Revert "Add command line tool that generates NOTICE.xml.gz for p..."" into main
2024-09-19 17:53:20 +00:00
Wei Li
71f114e347
Merge "Add command line tool that generates NOTICE.xml.gz for partitions." into main am: 9c3097d5fb
am: 8c0d7cd133
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3271576
Change-Id: I92d7fd14171ceedf62ddb111ea9bf277f9406243
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-19 17:48:09 +00:00
Priyanka Advani (xWF)
2f37c1980c
Revert "Add command line tool that generates NOTICE.xml.gz for p..."
...
Revert submission 3273112-soong-notice-xml
Reason for revert: Droidmonitor created revert due to b/368348129.
Reverted changes: /q/submissionid:3273112-soong-notice-xml
Change-Id: I55e1e93aa6d4b311c6ee461d4216a104909af842
2024-09-19 17:43:39 +00:00
Wei Li
9c3097d5fb
Merge "Add command line tool that generates NOTICE.xml.gz for partitions." into main
2024-09-19 17:37:06 +00:00
Nelson Li
21ba377f5a
Move the dist
target of mke2fs
to build/core/tasks
...
Because `mke2fs`, `make_f2fs`, and `make_f2fs_casefold` have
`recovery_available` set to true, Soong forcibly adds a new variation
with a `_recovery` suffix to the existing variations. If this is
directly added to the `dist` of the corresponding module, it will cause
duplication of the `android_recovery_<arch>/meta_lic` and
`android_<arch>/meta_lic` files.
Therefore, it is temporarily moved to `build/core/tasks`. Once the
issues are resolved, they will be moved to the corresponding modules.
Bug: 349741178
Test: m sdk dist
Change-Id: I1bea3aa2f42334c9ed14bf766aaa7e6f428ed35a
2024-09-19 07:20:46 +00:00
Treehugger Robot
04d2989388
Merge "Export USE_CAMERA_V4L2_HAL to soong" into main am: 48a08682fa
am: 8f91d9801d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3256421
Change-Id: Ic415d2e7b964b0fc470895078bba08c3fc603efc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-19 01:45:05 +00:00
Treehugger Robot
48a08682fa
Merge "Export USE_CAMERA_V4L2_HAL to soong" into main
2024-09-19 01:14:21 +00:00
Android Build Coastguard Worker
58f7e044c6
Version bump to AP4A.240919.002 [core/build_id.mk]
...
Change-Id: I0eb39e3ca24a6893106fc46a53a12970b0a50cf3
2024-09-19 00:35:11 +00:00
Krzysztof Kosiński
0d5776f887
Add required makefile for ARMv9.2-A.
...
Bug: 364383722
Test: presubmit, internal build for relevant device
Change-Id: I7ab3ab54e946a40d6c69c0bc1234d4032c89370e
2024-09-19 00:06:33 +00:00
Android Build Coastguard Worker
b645e7dc66
Make change and version bump to AP4A.240919.001
...
Snap for 12385180 from bdf28aa7bb
to 24Q4-release
Change-Id: I38709f83280d24ee85c4f40ce449bcbcd07e17f9
2024-09-18 23:45:01 +00:00
Florian Mayer
3340cf27f7
Use -target-feature for MTE
...
This combines with other features.
Bug: 366222162
Change-Id: I74bab7e725eaa856d183987fa682f2ab0903ce70
2024-09-18 21:18:19 +00:00
Wei Li
e4c1ec9466
Add command line tool that generates NOTICE.xml.gz for partitions.
...
The tool currently generates a XML file with the root element only and its content will be filled in in following CLs.
Also disable the generation of NOTICE.xml.gz in make when USE_SOONG_DEFINED_SYSTEM_IMAGE is true, so the Soong module could be used without conflict.
Bug: 330949782
Bug: 338342381
Test: lunch aosp_cf_x86_64_phone-trunk_staging-eng && m, and check that system/etc/NOTICE.xml.gz have all the XML elements.
Test: lunch aosp_cf_x86_64_phone_soong_system-trunk_staging-eng && m, and check that system/etc/NOTICE.xml.gz has root element only.
Change-Id: I82e90bd9aa3dabc605acfe8da697ab1f7e7ecf9b
2024-09-18 20:48:34 +00:00
Ashutosh Agarwal
bdf28aa7bb
Merge "Update core/Makefile to add variable PRODUCT_EXTRA_STUB_LIBRARIES." into main am: f09a84419c
am: 07fca5b929
...
Original change: https://android-review.googlesource.com/c/platform/build/+/3272171
Change-Id: I9ee45dd4887fd356899a0c2a093f329f43d17d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2024-09-18 18:44:05 +00:00
Ashutosh Agarwal
f0f939409d
Update core/Makefile to add variable PRODUCT_EXTRA_STUB_LIBRARIES.
...
This allows products to specify additional device-specific stub libraries that should be included in the system_linker_config. This is useful for products that need to include additional stub libraries that are not picked up by Soong automatically.
Bug: 361441210
Change-Id: Ia18c476e249ac5b14b43819fa0a4f0059dc620de
2024-09-18 14:24:05 +00:00
Android Build Coastguard Worker
7177ba4ce8
Make change and version bump to AP4A.240918.001
...
Snap for 12378824 from b015439ee6
to 24Q4-release
Change-Id: Ifaad4da8c4e5dffd6a0a6dfd7d9d7325936acc26
2024-09-17 23:46:40 +00:00
Yu-Ting Tseng
d1275b9333
Merge "flag guarded move of uprobestats into Mainline" into main
2024-09-17 21:22:16 +00:00
Android Build Coastguard Worker
aa77074f57
Version bump to AP4A.240917.002 [core/build_id.mk]
...
Change-Id: I3c2da952cc0d51ba5ddc5e96d806de284647cfb2
2024-09-17 18:13:16 +00:00
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
Yu-Ting Tseng
4688186da8
flag guarded move of uprobestats into Mainline
...
Bug: 355315669
Test: m
Ignore-AOSP-First: uprobestats is an internal-first project
Change-Id: Ifc74630a56a0be8669f0fb56ba6c8ba5f6435fc6
2024-09-13 09:32:36 -07: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