Commit Graph

37941 Commits

Author SHA1 Message Date
Krzysztof Kosiński
69b91bbf69 Merge "Add required makefile for ARMv9.2-A." into main am: f221b102b2 am: 936b3ed8b2
Original change: https://android-review.googlesource.com/c/platform/build/+/3273631

Change-Id: I8fba846e8ec3f2177c4a7fc42f854e26cfd1369a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-20 20:01:47 +00:00
Krzysztof Kosiński
f221b102b2 Merge "Add required makefile for ARMv9.2-A." into main 2024-09-20 19:06:44 +00:00
Wei Li
7b1440b53a Merge "Revert "Revert "Add command line tool that generates NOTICE.xml...."" into main am: ec85ca3e8a am: 12d93c5553
Original change: https://android-review.googlesource.com/c/platform/build/+/3273293

Change-Id: Ic81f445d3209898dbed09ffc53842c0ba7990cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-20 18:30:35 +00:00
Treehugger Robot
87f88af025 Merge "Package shared lib for camera-hal-tests" into main am: b98d218db7 am: 40a8efb2a3
Original change: https://android-review.googlesource.com/c/platform/build/+/3272860

Change-Id: Ia15fddfb68d30f6b8acd608e7d5bf4cb12b6d70d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-20 18:30:20 +00:00
Wei Li
ec85ca3e8a Merge "Revert "Revert "Add command line tool that generates NOTICE.xml...."" into main 2024-09-20 18:03:06 +00:00
Treehugger Robot
b98d218db7 Merge "Package shared lib for camera-hal-tests" into main 2024-09-20 17:28:48 +00:00
Dan Shi
8d5479a400 Package shared lib for camera-hal-tests
Bug: 362195892
Test: presubmit
Change-Id: Ia424942040c5e0d26f12cc0fcdb0925d90567809
2024-09-20 05:37:54 +00:00
Luca Farsi
21f24aafea Merge "Split out host shared libs target from device-tests" into main am: ccd39a1f18 am: 33e87e3f7d
Original change: https://android-review.googlesource.com/c/platform/build/+/3266094

Change-Id: Ia9b41f1db0e03c83db367bb205a17d1c74d23444
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 22:10:23 +00:00
Luca Farsi
ccd39a1f18 Merge "Split out host shared libs target from device-tests" into main 2024-09-19 21:23:07 +00:00
Florian Mayer
8730aa51d8 Merge "Use -target-feature for MTE" into main am: 9df15c9101 am: 7f50e5347d
Original change: https://android-review.googlesource.com/c/platform/build/+/3261733

Change-Id: I0e674a0342401195a4116a82165f05b27e54d207
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 21:13:57 +00:00
Florian Mayer
9df15c9101 Merge "Use -target-feature for MTE" into main 2024-09-19 20:41:23 +00:00
Luca Farsi
0b73dde4e9 Split out host shared libs target from device-tests
Split out the building of the host shared libs zip from the device-tests
target so it can be build separately. Building device-tests still still
build both.

Test: m device-tests, m device-tests-shared-libs
Bug: 366308541
Change-Id: I13741ce22823622a6bf4744cb55026765c188b8c
2024-09-19 12:05:06 -07:00
Priyanka Advani (xWF)
159dd4c276 Merge "Revert "Add command line tool that generates NOTICE.xml.gz for p..."" into main am: 75501177a5 am: f13f451e8b
Original change: https://android-review.googlesource.com/c/platform/build/+/3272667

Change-Id: I922961cd61934fefb09d8e4dd3a9de2e703961ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-19 18:02:33 +00:00
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
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
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
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
Yu-Ting Tseng
d1275b9333 Merge "flag guarded move of uprobestats into Mainline" into main 2024-09-17 21:22:16 +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
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
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
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