Commit Graph

37835 Commits

Author SHA1 Message Date
Spandan Das
c7271c08b7 Provide a host etc directory
This allows host etc modules to be installed in out/host/*. One use case
for this is art cc tests which have some data dependencies.

Test: presubmits
Change-Id: I2f0168f68c17c2fa4999d3cfcde7845eaef0bd48
2024-09-20 04:41:48 +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
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)
75501177a5 Merge "Revert "Add command line tool that generates NOTICE.xml.gz for p..."" into main 2024-09-19 17:53:20 +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
48a08682fa Merge "Export USE_CAMERA_V4L2_HAL to soong" into main 2024-09-19 01:14:21 +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
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
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
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
435145d063 Merge "Move create_root_structure.mk to the dont_bother block." into main 2024-09-12 08:29:21 +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
1d09815d07 Merge "Add a new Soong config variable EMMA_INSTRUMENT" into main 2024-09-12 03:09:24 +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
6fbebd4570 Merge "Move copy destination to "sts-sdk"" into main 2024-09-11 21:58:14 +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
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
963298af97 Merge "Move the creation of the root structure to build/core/main.mk" into main 2024-09-11 01:01:40 +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
Bill Yang
ab5457c038 Export USE_CAMERA_V4L2_HAL to soong
Export the variable for hardware/libhardware/modules/camera/3_4:camera.v4l2

Bug: 349300092
Test: lunch aosp_cheetah-trunk_staging-userdebug; \
      USE_CAMERA_V4L2_HAL=true m camera.v4l2 camera.v4l2_test

Change-Id: I590e5218dbe51af004a15d2da4456da7515e72dc
2024-09-10 03:39:50 +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
Xin Li
7c11265724 Merge "Merge 24Q3 to AOSP main" into main 2024-09-07 01:12: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
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
Chris Dombroski
daca2e7783 Move copy destination to "sts-sdk"
Also remove packaged Java

Bug: 364712647
Test: manual
Change-Id: I5b32aaa7b13ca5f4967e6214ce81dbe3fbd58791
2024-09-04 23:07:02 +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
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
Steven Moreland
58ff2ba627 Merge "Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND." into main am: 9d3787b166
Original change: https://android-review.googlesource.com/c/platform/build/+/3248862

Change-Id: I3aad2af970caf38cf32ffb7a5e28178591ec2574
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-09-03 23:56:21 +00:00
Steven Moreland
9d3787b166 Merge "Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND." into main 2024-09-03 23:44:16 +00:00
Steven Moreland
357d069f7f Monotonicity for NEED_AIDL_NDK_PLATFORM_BACKEND.
Hint to partners this will go away. We have limited
testing of this option, and we shouldn't maintain two
ways of handling NDK AIDL variants. So, this way
we can remove it in the future. :D

Bug: 161456198
Test: build
Change-Id: I5ae43b4f1b6c0d7253e82caeb338b69b7e00fdb6
2024-08-30 23:28:23 +00:00
Treehugger Robot
d0b36a410f Merge "Add boot_16k.img and dtbo_16k.img to target_files" into main am: 2091dc30e2
Original change: https://android-review.googlesource.com/c/platform/build/+/3236458

Change-Id: I1f4d2c41546df89e37af0085fb755f79981752f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-29 23:28:59 +00:00
Treehugger Robot
2091dc30e2 Merge "Add boot_16k.img and dtbo_16k.img to target_files" into main 2024-08-29 23:26:15 +00:00
Cole Faust
3c9e58c565 Merge changes I826b1ec6,I0667ef0e,Ie4481513 into main am: da669fa5f0
Original change: https://android-review.googlesource.com/c/platform/build/+/3247886

Change-Id: I499de7eb93d7399ae10b81918295838bb6e9505d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-29 22:14:19 +00:00
Kelvin Zhang
8948d13afc Add boot_16k.img and dtbo_16k.img to target_files
During signing, we need to re-generate dev option OTAs, as the 4K boot
images are getting signed with a different key. To allow generating
incremental OTAs for boot OTAs, include 16K variant of the boot images.

Test: th
Bug: 339658378
Change-Id: I0aafd5f48dbefeb2b86fd8bd93f6ce4d3f28a3cd
2024-08-29 13:38:45 -07:00
Herbert Xue
3e3cbeb3a5 Move COMPATIBILITY.tradefed_tests_dir to proper place
Bug: 341873065
Test: presubmit
Change-Id: Ibd99b07b8548eafb72254fda2a248b9ec32ee8ef
2024-08-29 14:46:50 +08:00
Joe Onorato
248580cb41 Add the list of makefiles that were also included by product config to dumpconfig.
In this entry, the first list of files is the inherit-product stack, and
the second one is the list of files included by the file at the top of
the stack that just finished processing

Test: build/make/ci/dump_product_config
Change-Id: I826b1ec6fa1319b8f0cdfaacc6ccf999ce93d9f1
2024-08-28 20:21:31 +00:00
Joe Onorato
6dfeb795e0 Add tracing for board config to dumpconfig
Test: build/make/ci/dump_product_config
Change-Id: I0667ef0e4427d396cedb03eaf2a314a789947e98
2024-08-28 20:21:31 +00:00
Joe Onorato
b34578cf74 Fix newline for dumpconfig
Test: build/make/ci/dump_product_config
Change-Id: Ie4481513b58f589a00b092114135788b1c4c62cd
2024-08-28 20:21:31 +00:00