Commit graph

33244 commits

Author SHA1 Message Date
Dan Albert
617597c0fa Trace build time by module name.
Bug: http://b/259130368
Test: built, manually examined trace file to find module_name
Change-Id: I2a20b60726e884ca82ba3244669d0257e9114222
2023-06-26 23:30:31 +00:00
Joe Onorato
9ccb457588 Merge "Rename device_config --> aconfig and definitions --> declarations" 2023-06-22 13:30:53 +00:00
Joe Onorato
6aa48f8c5f Rename device_config --> aconfig and definitions --> declarations
Bug: 285303012
Test: for x in next trunk trunk_food trunk_staging ; do lunch aosp_panther-$x-eng ; m nothing ; done
Change-Id: I174ce3e609fa9077ea6bc61679ddb83e8efe57c8
2023-06-21 15:18:15 -07:00
Wei Li
8968aa544b Merge "Support SBOM generation of m build unbundled APEXs." 2023-06-21 17:50:17 +00:00
Gabriel Biren
a58ce5e9d3 Merge "Add rule to convert WIFI_FEATURE_IMU_DETECTION to the equivalent soong variable." 2023-06-21 15:19:51 +00:00
Treehugger Robot
d0c29cbdeb Merge "Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES" 2023-06-21 05:18:58 +00:00
Wei Li
7c4f064a2b Support SBOM generation of m build unbundled APEXs.
Bug: 266726655
Test: banchan com.android.adbd arm64 userdebug && m dist
Test: build/soong/tests/sbom_test.sh
Change-Id: I7abadbc083ef66b0e8ace28de69a1a219670ec37
2023-06-20 11:23:56 -07:00
Jiakai Zhang
bedc1d3518 Merge "Add an entry in METADATA.txt to determine whether to use the CMC GC." 2023-06-20 13:52:04 +00:00
Jooyung Han
8cc42f429f Remove PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES
We will deprecate flattened apexes. In this change, GSI-specific make
variable (PRODUCT_INSTALL_EXTRA_FLATTENED_APEXES) is removed. The
variable was used to install both image/flattened apexes in the GSI, so
that it works on ro.apex.updatable devices and not-updatable devices.

Now, GSI will have only image APEXes in it.

Bug: 278826656
Test: lunch gsi_arm64-userdebug && m # no flattened apexes
Change-Id: I4702973d4ee75aa693e4e7f4e57577b77059dc09
2023-06-20 14:27:10 +09:00
Wei Li
c20175155a Merge "Include static libraries information in Android SBOM." 2023-06-19 22:02:20 +00:00
Jiakai Zhang
96b155c018 Add an entry in METADATA.txt to determine whether to use the CMC GC.
If the device uses the CMC GC, the file will contain:
extra-args = --runtime-arg -Xgc:CMC

Otherwise, the file will contain an empty line:
extra-args =

Bug: 287652269
Test: -
  1. m dist out/dist/boot.zip
  2. unzip -p out/dist/boot.zip METADATA.txt
Change-Id: I3d50367eb2a341e1c03286d7a2cd7ed44d59708f
2023-06-19 20:20:05 +01:00
Wei Li
d263695cd4 Include static libraries information in Android SBOM.
Bug: 280852724
Test: CIs
Test: lunch aosp_cf_x86_64_phone-userdebug && m sbom
Change-Id: Ie2365d79ba24910b7ace132b578589be10a17d78
2023-06-16 23:02:09 -07:00
Gabriel Biren
fdcf16f55c Add rule to convert WIFI_FEATURE_IMU_DETECTION
to the equivalent soong variable.

Bug: 287607876
Test: Manual test - add a log message to wifi_ext that
       only prints if the proper flag is enabled.
       Check whether the log is displayed, both before
       and after this change.
Change-Id: Id9bfc81384384b915e9772a2016a9843a57897db
2023-06-16 21:11:10 +00:00
Jooyung Han
e4635b3e04 Merge "Remove --blkid_path argument" 2023-06-16 06:48:57 +00:00
Justin Yun
a8a5a3ff62 Use map_file_generator only for the supported file systems
map_file_generator can generate map files from erofs and ext# file
systems. Check the file system type and copy images and generate map
files if supported. Otherwise skip these steps.
If the image files are not copied, add_img_to_target_files will
generate the image files and map files.

Bug: 286870582
Test: lunch bertha_x86_64-userdebug && m dist
Change-Id: Ib92dd989cf61b1e376107a507eae9222ceb1d0d4
2023-06-16 00:10:33 +09:00
Treehugger Robot
4b47e8a2f3 Merge "Allow map_file_generator to use host tools" 2023-06-14 16:25:26 +00:00
Jooyung Han
629490292a Remove --blkid_path argument
deapexer doesn't need it.

Bug: 279858383
Test: presubmit
Change-Id: If0ec42b5edd4642f07c96ba641030c4dd6fb4660
2023-06-14 15:16:34 +09:00
Treehugger Robot
c37e824f56 Merge "Move MTE mode settings to a product variable." 2023-06-14 01:42:22 +00:00
Kelvin Zhang
0eba102f19 Allow map_file_generator to use host tools
map_file_generator need to invoke binaries such as `unsquashfs` .
These binaries are built from android source tree, so add host binary
output directory to PATH variable so that map_file_generator can use
these binaries.

Test: th
Bug: 286870582
Change-Id: I56634293ee885fc4612627578a22cdf57bc13bfc
2023-06-13 18:24:15 -07:00
Evgenii Stepanov
80b53b8c77 Move MTE mode settings to a product variable.
Allow product configuration of memtag target list by
moving the current set into a product variable instead of the various
.bp files.

The default list of memtag targets can be found in
  build/make/target/product/memtag-common.mk

This is NFC as all targets in the list already have "memtag_heap: true"
in the build files.

Bug: 280343521
Test: no functional change
Change-Id: I5954fde05256e00a8e01c114ad522f50ed0cfa9f
2023-06-13 13:11:52 -07:00
Daniel Zheng
0fd9651321 Merge "Add dt partition in fastboot-info" 2023-06-13 17:35:59 +00:00
Joe Onorato
ac57d98b87 Merge "Allow and merge multiple release configs with the same name" 2023-06-13 15:13:04 +00:00
Treehugger Robot
913c41caf5 Merge "Use Z_BEST_COMPRESSION for compress-package" 2023-06-13 10:09:54 +00:00
Joe Onorato
1f6555151e Allow and merge multiple release configs with the same name
For now (to prevent build breakages when this is submitted), duplicate
flag values are allowed, but that will be disallowed once this change
automerges everywhere.

Bug: 286689485
Test: Treehugger
Change-Id: I723340ff9751b61d33c4108b0cc2f90702a116c9
2023-06-12 23:29:25 -07:00
Daniel Zheng
8ad23cf151 Add dt partition in fastboot-info
Adding dt partition in fastboot-info in case device uses it.

Test: m fastboot_info
Change-Id: Id5b3a70064f5ac6da8303f74c73e4d5f395a2c51
2023-06-12 09:57:54 -07:00
Jiakai Zhang
9448754144 Merge "Avoid using soong_zip's "-e" flag for boot.zip." 2023-06-12 16:22:39 +00:00
Daniel Zheng
d97f8505ae Merge "Removing --apply-vbmeta for vbmeta_system" 2023-06-12 15:42:16 +00:00
Jiakai Zhang
34914f620b Avoid using soong_zip's "-e" flag for boot.zip.
aosp/23658853 changes boot.zip, which need to be cherry-picked to UDC.
It uses soong_zip's "-e" flag to specify the filename to use in boot.zip
for METADATA.txt. However, the "-e" flag doesn't exist on UDC. This
change uses an alternative approach to avoid using the "-e" flag.

Before this change, the contents were written to
out/dist/boot.zip.METADATA.txt and then passed to soong_zip with "-e" to
rename to file to "METADATA.txt".

After this change, the contents are written to
out/dist/boot_zip/METADATA.txt and then passed to soong_zip with "-j" to
remove the directory name.

Bug: 286381070
Test: m dist out/dist/boot.zip (on udc-dev)
Change-Id: I769de5194b5716f05e5352f4efd635a70ba0b891
2023-06-12 11:27:46 +01:00
Jiakai Zhang
3d58caa11b Merge "Add mainline extension and METADATA.txt to boot.zip." 2023-06-12 09:02:46 +00:00
Joe Onorato
6d7afa00e3 Make RELEASE_PLATFORM_VERSION a release config flag to set platform version.
Bug: 282838389
Test: Treehugger
Merged-In: Ic6dacbdee7d2408aa8b25b4df59bf9bbc566d747
Change-Id: Ie61a7d986c2b8fe2c16117f6678b9e5a71711647
2023-06-11 09:17:43 -07:00
Joe Onorato
d6df20a058 Clean up the API for release config in starlark
Also gets the json summaries working again.

Bug: 283477392
Test: Manual
Merged-In: Iaeb840e96bd7fef2fa1492cb55d9688f7ca75858
Change-Id: I05d9b816ad7ad30c1d238d01df811426d9aeddcb
2023-06-11 07:58:22 -07:00
Joe Onorato
593bef7150 Merge "Define release flags in starlark instead of make" 2023-06-10 03:21:22 +00:00
Treehugger Robot
54066e8ddf Merge "Copy built images to generate target_files.zip" 2023-06-09 22:32:40 +00:00
Cole Faust
386b3746ce Define release flags in starlark instead of make
So that we have a more restricted enviornment for this new configuration
axis that can also be imported into other tools more easily.

Test: Manually (this time also tested setting OUT_DIR outside of the tree)
Change-Id: I01d90e06e45cba756156af16f63e04f575877263
2023-06-09 13:10:05 -07:00
Jiakai Zhang
a5551c5d91 Add mainline extension and METADATA.txt to boot.zip.
Contents of METADATA.txt:

booclasspath = dex_bootjars_input/core-oj.jar:dex_bootjars_input/core-libart.jar:dex_bootjars_input/okhttp.jar:dex_bootjars_input/bouncycastle.jar:dex_bootjars_input/apache-xml.jar:dex_bootjars_input/framework.jar:dex_bootjars_input/framework-graphics.jar:dex_bootjars_input/ext.jar:dex_bootjars_input/telephony-common.jar:dex_bootjars_input/voip-common.jar:dex_bootjars_input/ims-common.jar:dex_bootjars_input/core-icu4j.jar:apex_bootjars/framework-adservices.jar:apex_bootjars/framework-sdksandbox.jar:apex_bootjars/framework-appsearch.jar:apex_bootjars/framework-bluetooth.jar:apex_bootjars/conscrypt.jar:apex_bootjars/android.net.ipsec.ike.jar:apex_bootjars/updatable-media.jar:apex_bootjars/framework-mediaprovider.jar:apex_bootjars/framework-ondevicepersonalization.jar:apex_bootjars/framework-statsd.jar:apex_bootjars/framework-permission.jar:apex_bootjars/framework-permission-s.jar:apex_bootjars/framework-scheduling.jar:apex_bootjars/framework-sdkextensions.jar:apex_bootjars/framework-connectivity.jar:apex_bootjars/framework-connectivity-t.jar:apex_bootjars/framework-tethering.jar:apex_bootjars/framework-uwb.jar:apex_bootjars/framework-virtualization.jar:apex_bootjars/framework-wifi.jar
booclasspath-locations = /apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/framework-graphics.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/apex/com.android.i18n/javalib/core-icu4j.jar:/apex/com.android.adservices/javalib/framework-adservices.jar:/apex/com.android.adservices/javalib/framework-sdksandbox.jar:/apex/com.android.appsearch/javalib/framework-appsearch.jar:/apex/com.android.btservices/javalib/framework-bluetooth.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.ipsec/javalib/android.net.ipsec.ike.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.ondevicepersonalization/javalib/framework-ondevicepersonalization.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.permission/javalib/framework-permission-s.jar:/apex/com.android.scheduling/javalib/framework-scheduling.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.tethering/javalib/framework-connectivity.jar:/apex/com.android.tethering/javalib/framework-connectivity-t.jar:/apex/com.android.tethering/javalib/framework-tethering.jar:/apex/com.android.uwb/javalib/framework-uwb.jar:/apex/com.android.virt/javalib/framework-virtualization.jar:/apex/com.android.wifi/javalib/framework-wifi.jar
boot-image = system/framework/boot.art:system/framework/boot-framework-adservices.art

Bug: 286381070
Test: m dist out/dist/boot.zip
Change-Id: I258479ffbdf199091290b074329ff1b43db2e669
2023-06-09 17:56:31 +01:00
Jeongik Cha
8a64fb1663 BF_BUILD_NUMBER should have BUILD_NUMBER
BF_BUILD_NUMBER has hostname by mistake during refactoring.

Bug: 286453356
Test: build with BUILD_NUMBER
Change-Id: Id3fd7975057dfd70dfb7c02650672e670c6d5984
2023-06-09 11:51:18 +09:00
Treehugger Robot
a85c8a863a Merge "BOARD_VNDK_VERSION must be set first pass" 2023-06-08 23:19:34 +00:00
Daniel Zheng
9456228807 Removing --apply-vbmeta for vbmeta_system
Removing since vbmeta rewrite is only needed for root vbmeta

Test: m fastboot_info
Change-Id: Idd07629104b48db0b75b43d73cd59564583819a4
2023-06-08 11:14:58 -07:00
Florian Mayer
a0c6f31ef7 Merge "Fix bug when memtag_heap in diag but not sanitizers" 2023-06-08 16:04:08 +00:00
Nikita Ioffe
fe22cc38da Merge "Add PRODUCT_AVF_KERNEL_MODULES_ENABLED" 2023-06-07 23:36:20 +00:00
Florian Mayer
2a67626055 Fix bug when memtag_heap in diag but not sanitizers
Without this we get:
unsupported argument 'memtag_heap' to option '-fno-sanitize-trap='

Change-Id: Iaeb23d0f4962bb3d788036fadc14b9420221a38e
2023-06-07 16:13:22 -07:00
Steven Moreland
78549acb47 BOARD_VNDK_VERSION must be set first pass
Removing all places that consider that this might not be
set.

Bug: 122954981
Test: build
Change-Id: I62107d041410f4ee1d3652e394ed5e7688c12f25
2023-06-07 20:57:38 +00:00
Nikita Ioffe
cae3ef96c6 Add PRODUCT_AVF_KERNEL_MODULES_ENABLED
This flag controls whether com.android.virt APEX should include an
additional kernel image that supports modules loading.

Bug: 283822676
Bug: 278008256
Test: m
Change-Id: I296c57308e130ee6d5d185dcb4b690d11d2b04ac
2023-06-07 16:33:55 +01:00
Devin Moore
b1bae84508 Merge "Add static_libs to module-info.json" 2023-06-06 15:36:57 +00:00
Steven Moreland
0b219d399c Merge "Remove PRODUCT_SEPOLICY_SPLIT." 2023-06-05 23:08:24 +00:00
Devin Moore
48d7b3462d Add static_libs to module-info.json
This is helpful for analyzing how often a library is included statically
on a device. If a large library is linked statically in many processes
in a single device, it may be a good candidate for shared linking
instead.

This increases the size of module-info.json file on Cuttlefish by ~12.5%
from 65MB to 72MB.

Test: m
Bug: 280829178
Change-Id: I3614d86d799810e1ce845e1097f43f1ec0a412a3
2023-06-05 20:17:50 +00:00
Jiakai Zhang
ccf0471af3 Merge "Add an allowlist for modules that have broken optional_uses_libs." 2023-06-05 14:05:49 +00:00
Jooyung Han
e5cf1f98b8 Merge "Deprecation message for TARGET_FLATTEN_APEX" 2023-06-05 01:57:13 +00:00
Jiakai Zhang
9fd786cd55 Add an allowlist for modules that have broken optional_uses_libs.
Bug: 282877248
Test: m nothing
Change-Id: I6f0e76a6f147de1e6043b5abc4630342d46bafcc
2023-06-02 23:41:59 +01:00
Rob Seymour
7edc734ec1 Merge "Do not set DISABLE_PREOPT_BOOT_IMAGES when doing a VSDK build." 2023-06-02 19:27:09 +00:00