Commit Graph

37636 Commits

Author SHA1 Message Date
Treehugger Robot
95feb949e1 Merge "Optimize: Reduce vendor target build files" into main 2024-08-26 21:11:21 +00:00
Qing Shen
6a8fff595b Revert "Revert "Add a coverage suffix to avoid Ninja file regene..."
Revert submission 3235973-revert-3207217-emma-flip-time-saver-BYWASVIMTD

Reason for revert: Rolling forward with a fix.

Also add coverage suffix for module-info.mk.

https://android-build.corp.google.com/builds/abtd/run/L52600030005977043 shows the failure: FAILED: ninja: 'out/soong/module-info-sdv_ivi_cf.json', needed by 'out/target/product/sdv_ivi_cf/module-info.json', missing and no known rule to make it

Reverted changes: /q/submissionid:3235973-revert-3207217-emma-flip-time-saver-BYWASVIMTD

Change-Id: I0088fa18bf4d24a1c1d55389bd4a4b952ca2002b
TESTED: https://android-build.corp.google.com/builds/abtd/run/L00600030005992749
Bug: 331444846
2024-08-23 20:53:15 +00:00
Sangmin Lee
fd2e967af0 Optimize: Reduce vendor target build files
Prevent system/% files from being built by BUILDING_SYSTEM_IMAGE
and data/% files from being built by BUILDING_USERDATA_IMAGE

1) Address issue where system/% files were
being built even when
PRODUCT_BUILD_SYSTEM_IMAGE was false.
 This change reduces the ninja targets for
aosp_cf_x86_64_phone_vendor-trunk_staging-userdebug
from 140,427 to 57,303

Test:
lunch aosp_cf_x86_64_phone_vendor-trunk_staging-userdebug ; m

2) Resolve issue where data/% files were
being built during "m dist" even if
PRODUCT_BUILD_USERDATA_IMAGE was set to false

Test: Set any module to install at data partition using
LOCAL_MODULE_PATH=$(TARGET_OUT_DATA)/app
lunch aosp_cf_x86_64_phone_vendor-trunk_staging-userdebug ; m dist
Check the contents at out/target/product/vsoc_x86_64 and out/dist

Change-Id: I2a914339231d57598a6f30fc83fd8203d4107a11
2024-08-22 15:23:47 +09:00
Treehugger Robot
60f5f54e64 Merge "Add "TARGET_BOARD_PLATFORM" into soong_variables" into main 2024-08-22 05:43:38 +00:00
Wei Li
25b5c1c1b7 Merge "Use TARGET_OUT instead of TARGET_OUT_SYSTEM" into main 2024-08-22 00:40:32 +00:00
Hugo Drumond Jacob
9d42ae9a3d Merge "Revert "Add a coverage suffix to avoid Ninja file regeneration."" into main 2024-08-21 17:20:34 +00:00
Hugo Drumond Jacob
d69e11ee3c Revert "Add a coverage suffix to avoid Ninja file regeneration."
Revert submission 3207217-emma-flip-time-saver

Reason for revert: b/361236607

Reverted changes: /q/submissionid:3207217-emma-flip-time-saver

Change-Id: Id2e415232221baf2015b8170ceb64ee6f8d3f160
2024-08-21 13:07:09 +00:00
Jerome Gaillard
d93f559871 Merge "Add overlay files to layoutlib res.zip" into main 2024-08-21 08:56:09 +00:00
Herbert Xue
ad9d8e7169 Add "TARGET_BOARD_PLATFORM" into soong_variables
Bug: 360872208
Bug: 348120216
Test: aosp_cf_x86_64_phone-trunk_staging-eng && m hosttar
Change-Id: Ie5f630818c5bd538265a969abbb50f1fbe255f91
2024-08-21 13:00:21 +08:00
Treehugger Robot
cb56fa972b Merge "Don't pack target tests into art-host-tests.zip." into main 2024-08-20 17:14:47 +00:00
Treehugger Robot
f38c15ab8e Merge "make/core/Makefile: Skip images for local builds by default." into main 2024-08-20 16:48:51 +00:00
Jiakai Zhang
7731accb15 Don't pack target tests into art-host-tests.zip.
art-host-tests.mk packs target tests into art-host-tests.zip. This
behavior has been there since the very first version
(https://r.android.com/1437898).

Today, this behavior normally does nothing because target tests are
included in the ART testing apex and therefore not visible to Make.
However, if we remove any target tests from the ART testing apex, this
behavior will start to cause problems (b/360150490), as it will pack
those removed target tests into art-host-tests.zip and continous testing
will fail to run them.

This change removes this behavior.

Bug: 357802879
Bug: 169111770
Bug: 360150490
Test: `m art-host-tests` and see that the output is bit-identical with
  and without the change.
Change-Id: I2e9abdf4ed51bd8dc91637d7502350dfafb4aa39
2024-08-20 14:47:58 +00:00
Jerome Gaillard
c97c0b4a7c Add overlay files to layoutlib res.zip
This adds resource overlay files to the res.zip file created by
layoutlib_data.mk. This also updates the script generating the
corresponding SBOM file.

Bug: 335355919
Test: m layoutlib
Change-Id: I2427be23720324eb03bd428d220b8777e3bf49bb
2024-08-20 13:37:41 +01:00
Treehugger Robot
273f97b5a3 Merge "Add rbc version of soong_config_set_bool" into main 2024-08-20 01:32:07 +00:00
Qing Shen
ca2fe2cd81 Merge "Add a coverage suffix to avoid Ninja file regeneration." into main 2024-08-20 01:16:53 +00:00
Cole Faust
88eeea5b2e Add rbc version of soong_config_set_bool
Bug: 342006386
Test: go test
Change-Id: Icd885bc576715f650c02d7f4043e6ace8842f0da
2024-08-19 17:35:31 -07:00
Alex Klein
af49729c5a make/core/Makefile: Skip images for local builds by default.
Packing and archiving the image are expensive operations.
Swap the image archive to dist-files for builders, and skip
building the raw image locally unless it's specifically
requested via the new PHONY targets.

Bug: None
Test: m, m dist, m pack-image
Change-Id: I2a3f1ebea689c23da88ca6d0757b827b7eb0c936
2024-08-19 11:43:06 -06:00
Treehugger Robot
c8a5399192 Merge "Migrate ramdisk_node_list configuration to Android.bp" into main 2024-08-16 14:51:15 +00:00
Jooyung Han
113f1f5c7e Merge "Add /odm/apex/ support." into main 2024-08-16 03:46:57 +00:00
Treehugger Robot
00378b193d Merge "Export variable to soong for converting vintf_compatibility_matrix" into main 2024-08-15 09:07:38 +00:00
Jooyung Han
1e45baff6b Add /odm/apex/ support.
We now allow APEXes in /odm.

Bug: 162049873
Change-Id: I2af97504a8d6159e778f8f833335db49beee6873
2024-08-15 07:38:17 +00:00
Nelson Li
1503d8355e Migrate ramdisk_node_list configuration to Android.bp
Removed the hardcoded assignment of `RAMDISK_NODE_LIST` in
`build/core/Makefile`. Instead, a filegroup definition in Android.bp is
now used to manage `ramdisk_node_list` and its export to the make
variable. This change enhances flexibility and simplifies the build
process by eliminating the need for a fixed installation path.

Bug: 359423289
Test: m -j $(PRODUCT_OUT)/ramdisk.img
Change-Id: I5aea108d426a615fa951c368c16f7cdea73252b1
2024-08-15 11:30:47 +08:00
Treehugger Robot
232929ccdb Merge "Create transitive-res-packages for prebuilt java libraries" into main 2024-08-14 16:29:31 +00:00
Abdelrahman Daim
358ed39d53 Use TARGET_OUT instead of TARGET_OUT_SYSTEM
Summary: There is a bug in aosp source which  tries to use a variable TARGET_OUT_SYSTEM that never gets defined anywhere else. This patches to use TARGET_OUT which maps to the path $(PRODUCT_OUT)/system.

Test: Successful Build on master branch

Change-Id: I89296b8df0a68258337db8fd6fa8a6c9d43f7af1
Signed-off-by: Abdelrahman Daim <adaim@meta.com>
2024-08-14 07:55:25 -07:00
Qing Shen
2c7fb2df08 Add a coverage suffix to avoid Ninja file regeneration.
This CL uses the environment variable, EMMA_INSTRUMENT to determine whether or not coverage is enabled. If coverage is enabled, it adds a bunch of suffixes to the files generated in out/soong/ folders.

This change reduces the build time by avoiding ninja regeneration when users simply switches from atest to atest --experimental-coverage, or vice versa, and no Android.bp changes are made.

Bug: 331444846
Test: Locally run m libc, and then EMMA_INSTRUMENT m libc twice, no ninja regenerations required. Compared the hash of out/target/product/vsoc_x86_64/ between the before-change repo and after-change repo. Only diff is the after-change directory contains an extra file `out/target/product/vsoc_x86_64/.installable_files` while the original directory has only `out/target/product/vsoc_x86_64/.installable_files.previous`, both files have the same hash.
Change-Id: I91eb1134ac552f47a40f3d5ddaab630d146b0773
2024-08-14 01:21:56 +00:00
Treehugger Robot
5ab8f4a84b Merge "Remove module_build_from_source soong config variable" into main 2024-08-14 00:36:57 +00:00
Spandan Das
8a58e78f9e Remove module_build_from_source soong config variable
This value is a noop in V+ trees. It was previously used as one of the
inputs for source vs prebuilts selection of mainline modules.

Bug: 308187800
Test: presubmits
Change-Id: I24432a982b6fadd3e7a1a89c730c8ccc0abb4709
2024-08-13 23:11:15 +00:00
Treehugger Robot
f55902f65f Merge "target-files: Support erofs_compress_hints" into main 2024-08-13 01:21:02 +00:00
Treehugger Robot
57ac3a18ea Merge "Build product/odm build.prop with Soong" into main 2024-08-12 00:08:32 +00:00
Yike Zhang
651fa75112 Merge "Link shared libs to x86/x86_64 folder if available" into main 2024-08-09 17:02:25 +00:00
yike
261e22dd1d Link shared libs to x86/x86_64 folder if available
Currently, the shared libs are not categorized according to arch,
which adds more redundant dependencies at runtime and might mislead
the test execution.

Test: m host-unit-tests
Bug: 351909435
Change-Id: I48f8e6752879cdd4d510ce5b611dc6c118a42f8f
2024-08-09 03:34:08 +00:00
Treehugger Robot
b3984cac84 Merge "Export related make variables for gralloc.default to soong" into main 2024-08-09 02:44:45 +00:00
Jooyung Han
67911682c2 target-files: Support erofs_compress_hints
erofs_compress_hints files should be copied into target-files and then
sign_target_files_apks should use them from the target-files.

Bug: 357721652
Test: m target-files-package (with aosp/3204257)
Test: sign_target_files_apks <target_file> signed-target-files.zip
Change-Id: Id55000004ecb72ea8fec19bfbe144c9b4d3f06cb
2024-08-09 08:27:19 +09:00
Treehugger Robot
9fe7f1fa9e Merge "Update sts-sdk to use new source" into main 2024-08-08 18:19:28 +00:00
Inseob Kim
d05947dd12 Build product/odm build.prop with Soong
Bug: 322090587
Test: compare build.prop before and after, boot
Change-Id: Iab157cf313d62c1c95ef66dd0a2b9563ee60ab46
2024-08-08 17:48:43 +09:00
yangbill
43c861469d Export related make variables for gralloc.default to soong
Bug: 356533884
Test: ./prebuilts/build-tools/linux-x86/bin/py3-cmd build/bazel/ci/rbc_dashboard.py --quick
Change-Id: I05849a6f20aae807d47c9cf46d127234d53c36e8
2024-08-08 07:35:58 +00:00
Wei Li
9489a0835c Merge "Switch SBOM generation of products to Soong and remove the function in Make." into main 2024-08-06 18:17:36 +00:00
Treehugger Robot
f4a9dab360 Merge "core/Makefile: Add desktop recovery image target hook" into main 2024-08-06 17:54:42 +00:00
Spandan Das
699f9be18a Merge "Move the installation rules of device boot images to soong" into main 2024-08-06 02:27:31 +00:00
Treehugger Robot
905319607d Merge "Build system_ext build.prop with Soong" into main 2024-08-06 02:00:28 +00:00
Makoto Onuki
c60b50c29c Merge "[Ravenwood] Use default socket timeout" into main 2024-08-05 15:45:13 +00:00
Inseob Kim
6dbd7eb601 Build system_ext build.prop with Soong
Bug: 322090587
Test: build and compare system_ext/etc/build.prop
Change-Id: I7b1af2e2b1fe7f107e1540d7b797c7bf489b8a0d
2024-08-05 12:50:01 +09:00
Wei Li
4d7e700997 Switch SBOM generation of products to Soong and remove the function in Make.
Bug: 324467079
Test: m sbom
Test: m dist
Test: banchan com.android.adbd module_arm64 userdebug && m sbom && m dist
Test: build/soong/tests/sbom_test.sh
Change-Id: Ic862604acd3ad11ef238748a744a8e675d2a141a
2024-08-02 17:56:28 -07:00
Chris Dombroski
1b569e4dd3 Update sts-sdk to use new source
Test: builds
Bug: 325295485
Change-Id: Iced085665b567eb675e3ee4ff54070d542b97f7d
2024-08-02 21:31:31 +00:00
Lokesh Kumar Goel
a4007985ec Merge "Allow PLATFORM_BASE_OS override from product config" into main 2024-08-02 14:55:29 +00:00
yangbill
c0db374be7 Export variable to soong for converting vintf_compatibility_matrix
Bug: 352234038
Bug: 344445679

Test: m
Change-Id: Idf1002d8238f4657ce8787077be5dfcc6d57013e
2024-08-02 08:36:36 +00:00
Jae Hoon Kim
3a38f1f108 core/Makefile: Add desktop recovery image target hook
.. allowing for targets to trigger recovery image builds.

Bug: b:343235730, b:355487693
Test: m, with desktop target enabling PACK_DESKTOP_RECOVERY_IMAGES
Flag: EXEMPT desktop only change
Change-Id: Idd5483747283aeba8086a90b7eb0590e47b9549e
2024-08-02 06:55:49 +00:00
Treehugger Robot
9b6324bf40 Merge "Add art_build_host_debug to soong config variable" into main 2024-08-02 04:50:44 +00:00
Treehugger Robot
351106c236 Merge "Reland "Add variables for init.environ.rc"" into main 2024-08-02 02:28:10 +00:00
John Wu
5a6dc72340 [Ravenwood] Use default socket timeout
Test: manually run long ravenwood tests
Flag: EXEMPT host side change only
Change-Id: Ic29bd9279c55a7f9d75aa873451e53bf725b8e6d
2024-08-02 00:24:18 +00:00