Commit Graph

36131 Commits

Author SHA1 Message Date
Dan Shi
e8519a7bad Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main 2023-12-13 19:19:16 +00:00
Dan Shi
16490d3207 Revert "Allow to override fastboot-info.txt for specific board"
Revert submission 2871156-fastboot_info

Reason for revert: possble cause of b/315866782

Reverted changes: /q/submissionid:2871156-fastboot_info

Change-Id: I07baf20bd50529a36f2841350a24ba58d480f5e2
2023-12-13 18:58:49 +00:00
Dmitrii Merkurev
aaf82ff626 Merge "Allow to override fastboot-info.txt for specific board" into main 2023-12-13 02:56:12 +00:00
Dmitrii Merkurev
21eeb06291 Allow to override fastboot-info.txt for specific board
Introduce TARGET_BOARD_FASTBOOT_INFO_FILE to override
fastboot-info.txt generated by default

Test: locally with CF target on related change
Bug: 315811289
Change-Id: I52208e49ac1dfe8558849be9befa60df805665e3
Signed-off-by: Dmitrii Merkurev <dimorinny@google.com>
2023-12-12 22:10:32 +00:00
George Lin
7c607a0e32 Merge "Revert "Fix the KNOWN_CODENAMES to include "L"."" into main 2023-12-09 00:13:57 +00:00
George Lin
b30e25376f Revert "Fix the KNOWN_CODENAMES to include "L"."
This reverts commit c4517b0fbd.

Reason for revert: The CL is considered a culprit of b/315384164

Change-Id: I47479cad38f2337e68e14a5e31bd9bc26d948b94
2023-12-08 21:45:17 +00:00
Treehugger Robot
428953becb Merge "Fix the KNOWN_CODENAMES to include "L"." into main am: d4a39894ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2865065

Change-Id: I1236f2a84e1b6fce4bc27d366006d7bbac69ab50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 22:54:08 +00:00
Treehugger Robot
d4a39894ca Merge "Fix the KNOWN_CODENAMES to include "L"." into main 2023-12-07 22:47:29 +00:00
Colin Cross
6e838663c3 Merge "Add --dedup flag to generate-partition-aconfig-flag-file" into main am: 2118e738b2
Original change: https://android-review.googlesource.com/c/platform/build/+/2861369

Change-Id: Ie532c29ad682051650598340a7452efda10f4e30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-07 22:37:13 +00:00
Colin Cross
2118e738b2 Merge "Add --dedup flag to generate-partition-aconfig-flag-file" into main 2023-12-07 21:56:31 +00:00
Jeff Hamilton
c4517b0fbd Fix the KNOWN_CODENAMES to include "L".
Bug: 307733231
Test: atest CtsOsTestCases:android.os.cts.BuildTest
Change-Id: Ie648f241d3d2deb5de2b937916df7ce3d7d15014
2023-12-07 19:44:17 +00:00
Vilas Bhat
e8c4ae9094 Merge changes from topic "update-no-bionic-page-size" into main am: f28fa571d0
Original change: https://android-review.googlesource.com/c/platform/build/+/2859825

Change-Id: I1bb67a1412f36339dc4bf4fbe2e7a735af8b68ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-06 14:09:16 +00:00
Colin Cross
706b0c3ddb Add --dedup flag to generate-partition-aconfig-flag-file
When Soong creates per-module aconfig files by merging aconfig files
from dependencies $(sort) is no longer sufficient to dedup identical
flags.  Pass --dedup to aconfig dump.

Fixes: 313698230
Test: m out/target/product/vsoc_x86_64/system/etc/aconfig_flags.pb
Change-Id: Icd8a3fbff8fe0be1dbb617ac1db4bd73f35b2d2f
2023-12-05 16:39:20 -08:00
Vilas Bhat
f464d39aed 16k: core: Update DevicePageSizeAgnostic to DeviceNoBionicPageSizeMacro
This is part of a larger change to update the flag
PRODUCT_PAGE_SIZE_AGNOSTIC to PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO.
This is to help clarify that this flag doesn't mean the device
will actually work end-to-end with any page size.

Bug: 312541564
Change-Id: I584282ab5623003721c0c32483a842de1b4f9ef9
2023-12-05 22:01:08 +00:00
Vilas Bhat
01e2b98ca8 16k: core: Update PRODUCT_PAGE_SIZE_AGNOSTIC to PRODUCT_NO_BIONIC_PAGE_SIZE_MACRO
This is to help clarify that this flag doesn't mean the device
will actually work end-to-end with any page size. Renaming
several dependent variables will be done in subsequent patches.

Bug: 312541564
Test:
```
 $ source build/envsetup.sh
 $ lunch aosp_cf_arm64_phone_pgagnostic-trunk-userdebug
 $ get_build_var TARGET_NO_BIONIC_PAGE_SIZE_MACRO
 true
```
Change-Id: I9bae8b00139f601a3324da902aeb4ae82113ccdd
2023-12-05 21:59:31 +00:00
Treehugger Robot
cc2c31d146 Merge "Use SOONG_STUB_VENDOR_LIBRARIES for vendor linker.config.pb" into main am: e47f6ffa2b
Original change: https://android-review.googlesource.com/c/platform/build/+/2855527

Change-Id: Iab4a52d50a298dc09860552294e282730138d473
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 05:57:01 +00:00
Colin Cross
691e2d574a Merge "Fix test data to use my_test_data_file_pairs" into main am: faa072b97f
Original change: https://android-review.googlesource.com/c/platform/build/+/2842097

Change-Id: Icbed5abe705a64402dd33ef3fe046b318f70bb25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 05:56:25 +00:00
Treehugger Robot
e47f6ffa2b Merge "Use SOONG_STUB_VENDOR_LIBRARIES for vendor linker.config.pb" into main 2023-12-05 05:47:09 +00:00
Colin Cross
faa072b97f Merge "Fix test data to use my_test_data_file_pairs" into main 2023-12-05 05:43:20 +00:00
Seungjae Yoo
9b83205f41 Merge "Append pubkey of microdroid-vendor into avb prop of vendor_boot" into main am: 5d034ba5c0
Original change: https://android-review.googlesource.com/c/platform/build/+/2856828

Change-Id: I41efbe70ab0813bcfc8c690e8a7c30a85d7f307d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 05:29:05 +00:00
Seungjae Yoo
5d034ba5c0 Merge "Append pubkey of microdroid-vendor into avb prop of vendor_boot" into main 2023-12-05 04:49:57 +00:00
Treehugger Robot
348c30ec73 Merge "Define __ANDROID_VENDOR_API__" into main am: e4922b8796
Original change: https://android-review.googlesource.com/c/platform/build/+/2851329

Change-Id: I609ac123e62409720e956841580f09ab15f0f402
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 03:50:30 +00:00
Treehugger Robot
e4922b8796 Merge "Define __ANDROID_VENDOR_API__" into main 2023-12-05 03:48:26 +00:00
Seungjae Yoo
e68d922118 Append pubkey of microdroid-vendor into avb prop of vendor_boot
For protected VM in AVF, the public key of microdroid-vendor partition
should be passed via trustable way. However, pvmfw config data is
constructed from ABL. AVB property is needed to pass the public key from
the source code into ABL, determined in the build time.

Bug: 285854379
Test: avbtool info_image --image $ANDROID_PRODUCT_OUT/vendor_boot.img
Change-Id: I024d1d835cccb27feef1164aca30712dbb8a70da
2023-12-05 12:17:46 +09:00
Colin Cross
2758ef4c91 Merge "Simplify module-info.json by leaving out optional fields" into main am: 8bb8482755
Original change: https://android-review.googlesource.com/c/platform/build/+/2835094

Change-Id: I3de53ec1334e4ccd4cc0069292cdef2928d86822
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 01:38:16 +00:00
Colin Cross
8bb8482755 Merge "Simplify module-info.json by leaving out optional fields" into main 2023-12-05 00:28:46 +00:00
Colin Cross
373496e27d Merge "Don't install test data from Soong" into main am: 35ce86d65e
Original change: https://android-review.googlesource.com/c/platform/build/+/2835093

Change-Id: Ic655eb1b7172fbf491942af84f1836c099e29440
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 19:22:40 +00:00
Colin Cross
35ce86d65e Merge "Don't install test data from Soong" into main 2023-12-01 18:56:01 +00:00
Treehugger Robot
c737e099b7 Merge "Disable stack-depth" into main am: 60bb7b0d75
Original change: https://android-review.googlesource.com/c/platform/build/+/2854225

Change-Id: I19abe80da66839fca1bf4ef187741ff8bb034f2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 13:15:45 +00:00
Treehugger Robot
60bb7b0d75 Merge "Disable stack-depth" into main 2023-12-01 12:17:33 +00:00
Jooyung Han
a7bb8532f6 Use SOONG_STUB_VENDOR_LIBRARIES for vendor linker.config.pb
STUB_LIBRARIES lists all stub libraries including "system" libraries.
There can be a library that provides "stub" only for "system" variant
while its vendor variant doesn't. (e.g. libz). In such cases, using
STUB_LIBRARIES will result a wrong "provide" list in
vendor/etc/linker.config.pb.

So, instead, use SOONG_STUB_VENDOR_LIBRARIES which only lists stub
libraries that are installed in /vendor.

Bug: 313806237
Test: m & cvd start
Test: $OUT/vendor/etc/linker.config.pb doesn't list libz.so
Change-Id: If0f2089594bda5f799fd495f80a27493553cb4e1
2023-12-01 16:39:48 +09:00
Treehugger Robot
8e0c07166d Merge "Increase scudo MTE buffer for fullmte devices" into main am: 1a9dd1c7de
Original change: https://android-review.googlesource.com/c/platform/build/+/2819967

Change-Id: Idec248d0fb251cf6aca35ba6a5af1f6eeb8ef9d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 03:25:27 +00:00
Treehugger Robot
1a9dd1c7de Merge "Increase scudo MTE buffer for fullmte devices" into main 2023-12-01 02:52:38 +00:00
Justin Yun
2c583744cb Define __ANDROID_VENDOR_API__
cc modules can use __ANDROID_VENDOR_API__ to read BOARD_API_LEVEL
that is the API level of the vendor surface.

Bug: 313822931
Test: check ninja commands to have -D__ANDROID_VENDOR_API__=<version>
Change-Id: I868b88ae72b4f60bc3d5ad567fbacd2222dd62d7
2023-11-30 05:30:48 +00:00
Joey Jiao
0e6d1c90b9 Disable stack-depth
Port the same setting from build/soong,
fuzzer build failed without disable stack-depth

Change-Id: I62dbf6a8e3ef92abee79ad14fc3624959847ec33
2023-11-30 07:34:18 +05:30
Colin Cross
25f3963f22 Merge "Use files written by Soong" into main am: da0bc02bbf
Original change: https://android-review.googlesource.com/c/platform/build/+/2842096

Change-Id: I2b6159e4ffe285ccf659982bade4fb7690846dae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 01:26:48 +00:00
Daniel Rosenberg
53661d57b2 Merge "Add support for different F2FS block sizes" into main am: 5514a5aaf6
Original change: https://android-review.googlesource.com/c/platform/build/+/2835796

Change-Id: I452c9665ca1f92842dd53a4fbe83805e2fd92f0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-30 01:00:38 +00:00
Colin Cross
da0bc02bbf Merge "Use files written by Soong" into main 2023-11-30 00:41:43 +00:00
Daniel Rosenberg
5514a5aaf6 Merge "Add support for different F2FS block sizes" into main 2023-11-30 00:24:46 +00:00
Colin Cross
7bf03bf68e Fix test data to use my_test_data_file_pairs
The format of LOCAL_TEST_DATA when provided by Soong can included a
third colon-separated field with an extra relative path that is not
being handled when assigning to ALL_MODULES.$(my_register_name).TEST_DATA.
Use my_test_data_file_pairs instead, which has already been transformed
to a src:dest pair.

Bug: 311428265
Test: examine module-info.json
Change-Id: I3a089cc24ea1492f1f7cf891c73ee7b43f273bb3
2023-11-29 10:18:52 -08:00
Colin Cross
4ea5e85143 Simplify module-info.json by leaving out optional fields
Every field in module-info.json has at least "[]".  Add functions to
only write the values when they are non-empty to reduce the size
and ease comparison when module-info.json is written by Soong.

Bug: 309006256
Test: atest --host toybox-gtests --test-timeout=120000
Change-Id: I200e8c8fd9727b4cffa9b82318f4433fd630e933
2023-11-29 10:18:52 -08:00
Colin Cross
2062646c87 Don't install test data from Soong
Soong has already created the test data installation rules.  Make still
handles packaging the test data into test suites.

Bug: 311428265
Test: atest --host toybox-gtests --test-timeout=120000
Change-Id: Ida0469e600b1dec4ce4e450a6c517ae13c133ded
2023-11-29 10:18:52 -08:00
Colin Cross
3a2ff8e27e Use files written by Soong
Soong now writes transitive resource packages and combined proguard
flags files to files instead of passing them as a list to Make, so
Make no longer needs to write them to files.

Bug: 309006256
Test: m checkbuild
Change-Id: I3ff78047f417f8578063f9c7a97ef4c65ba33af3
2023-11-29 10:18:52 -08:00
Jiakai Zhang
e1dd0563b3 Merge changes from topics "disable-art-service-dexopt", "remove-preopt-extracted-apk" into main am: 1f61e734d6
Original change: https://android-review.googlesource.com/c/platform/build/+/2847398

Change-Id: Ib519b83b3700a4014d5b5d9d868dc73c9cb5219c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 10:50:42 +00:00
Jiakai Zhang
1f61e734d6 Merge changes from topics "disable-art-service-dexopt", "remove-preopt-extracted-apk" into main
* changes:
  Remove PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK.
  Set `dalvik.vm.disable-art-service-dexopt=true` on eng build.
2023-11-29 10:17:29 +00:00
Yi-Yo Chiang
3637989aa1 Merge "Deprecate BOARD_GKI_SIGNING_* vars and build rules" into main am: 3afaac28b9
Original change: https://android-review.googlesource.com/c/platform/build/+/2846155

Change-Id: I67902ab748b64c7bc23eb9c3c1032d3c606f34b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 03:41:59 +00:00
Yi-Yo Chiang
3afaac28b9 Merge "Deprecate BOARD_GKI_SIGNING_* vars and build rules" into main 2023-11-29 03:04:59 +00:00
Colin Cross
af7c3ce438 Merge "Don't store notice files for Soong modules" into main am: 00a0933af0
Original change: https://android-review.googlesource.com/c/platform/build/+/2842095

Change-Id: I6ddcd84e01ced0ad193157706f98be06d0640d1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-28 23:07:28 +00:00
Colin Cross
00a0933af0 Merge "Don't store notice files for Soong modules" into main 2023-11-28 22:51:32 +00:00
Jiakai Zhang
364e9c39de Remove PRODUCT_ALWAYS_PREOPT_EXTRACTED_APK.
This was added by r.android.com/513843 to force dexpreopt some GMS core
modules even if dexpreopt is disabled, to avoid some memory usage
regression. We no longer need it because dexpreopt is never disabled on
production builds.

Bug: 313505540
Test: m
Change-Id: Iff7f1d340a3ecd64cdc3d2f83f9c37c109a81fda
2023-11-28 13:46:13 +00:00