Commit graph

92984 commits

Author SHA1 Message Date
Roshan Pius
d5074b3d7d Merge "Revert "Revert "handheld_system: Use build flag for NFC stack in..."" into main 2023-12-05 15:05:44 +00:00
Oriol Prieto Gascó
073e0b798f Merge "Add container field to flag_declarations" into main am: 6344fdf9a6
Original change: https://android-review.googlesource.com/c/platform/build/+/2843433

Change-Id: I14d7272d2b2551aacfb3ed01e856a6cb7fd93944
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 12:41:53 +00:00
Oriol Prieto Gascó
6344fdf9a6 Merge "Add container field to flag_declarations" into main 2023-12-05 11:46:43 +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
Roshan Pius
57c1fa5d11 Revert "Revert "handheld_system: Use build flag for NFC stack in..."
Revert submission 25548952-revert-25531363-nfc_apex_reland_flags-TJRICWNQNN

Reason for revert: Reland with build failure fix.

Reverted changes: /q/submissionid:25548952-revert-25531363-nfc_apex_reland_flags-TJRICWNQNN

Bug: 303286040
Test: Compiles
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:76cf501a8ae2965d61937c2a8aab99698cb41c20)
Merged-In: Ic8fdadeaf49eafb2119a94e6dd61b808c60fad96
Change-Id: Ic8fdadeaf49eafb2119a94e6dd61b808c60fad96
2023-12-05 05:42:12 +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
Yi-Yo Chiang
690fdfd597 Merge "releasetools: Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE" into main am: 7a519aebde
Original change: https://android-review.googlesource.com/c/platform/build/+/2855526

Change-Id: Icef51848427dfe0bd2ec641e4f628332357e1a9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 03:50:20 +00:00
Treehugger Robot
e4922b8796 Merge "Define __ANDROID_VENDOR_API__" into main 2023-12-05 03:48:26 +00:00
Yi-Yo Chiang
7a519aebde Merge "releasetools: Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE" into main 2023-12-05 03:29:42 +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
Oriol Prieto Gasco
7afc7e7b1c Add container field to flag_declarations
A container is software which is always built in its entirety using the
same build environment. In particular, all of its parts are built using
the same build-time default flag values. In addition, containers are
always installed as a single unit.

Bug: 312696545
Test: atest aconfig.test && m all_aconfig_declarations
Change-Id: I2ef3db836c4456f4f4fb5c066edf9094e38f89cc
2023-12-05 02:25:01 +00:00
Treehugger Robot
45b73c3294 Merge "Add the next release to Class2NonSdkList." into main am: 2f9162f1cb
Original change: https://android-review.googlesource.com/c/platform/build/+/2858125

Change-Id: I92ca1b7e7022554be9bd93022159519b669e3454
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 01:38:53 +00: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
Treehugger Robot
2f9162f1cb Merge "Add the next release to Class2NonSdkList." into main 2023-12-05 00:56:20 +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
Alex Buynytskyy
48d64b886a Add the next release to Class2NonSdkList.
Fixes: 313893203
Test: step-1
Change-Id: I0f6ae822cd206df23a2ffd1dade78bb430006c5d
2023-12-04 23:15:43 +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
Roshan Pius
d2f4f984cf Merge "build(nfc): Create framework-nfc sdk library" into main am: 999d9a1924
Original change: https://android-review.googlesource.com/c/platform/build/+/2828697

Change-Id: Ie716fe1916adb2dc42045eeef84b8cc16d2aac20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 18:20:31 +00:00
Roshan Pius
999d9a1924 Merge "build(nfc): Create framework-nfc sdk library" into main 2023-12-01 17:12:39 +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
Treehugger Robot
ceabadb916 Merge "Revert "releasetools: Deprecate GKI build rules"" into main am: e5bfa38457
Original change: https://android-review.googlesource.com/c/platform/build/+/2854392

Change-Id: Ib6b0d2e7fe90896b6e73305be4bd16be3c9f059f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 09:15:43 +00:00
Yi-Yo Chiang
18650c7be0 releasetools: Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE
This variable is always false or empty now, so clean up remaining
references to the variable.

Bug: 241346584
Test: Presubmit
Change-Id: I5dd3d356729d0bd2639633580bbb85f8b03582cf
2023-12-01 09:03:08 +00:00
Treehugger Robot
e5bfa38457 Merge "Revert "releasetools: Deprecate GKI build rules"" into main 2023-12-01 08:18:40 +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
Yi-Yo Chiang
92a517d75e Revert "releasetools: Deprecate GKI build rules"
This reverts commit faaede0f01.

Reason for revert: caused GSI sign failure b/311134118#comment23

Change-Id: Id794a8ab3369c907834a73cc88ea1640dc7492d1
2023-12-01 07:02:17 +00: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
69e2311d42 Merge "Remove non-functional check owners script that pre-dated gerrit." into main am: 45db0e0c17
Original change: https://android-review.googlesource.com/c/platform/build/+/2852287

Change-Id: I0fbdd6b16304424f64720aeb92c844476b2b96aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-01 03:24:57 +00:00
Treehugger Robot
1a9dd1c7de Merge "Increase scudo MTE buffer for fullmte devices" into main 2023-12-01 02:52:38 +00:00
Treehugger Robot
45db0e0c17 Merge "Remove non-functional check owners script that pre-dated gerrit." into main 2023-12-01 02:10:41 +00:00
Sam Saccone
452b4fd805 Remove non-functional check owners script that pre-dated gerrit.
The gerrit team has now official ways of validating owner files
https://android-review.googlesource.com/plugins/code-owners/Documentation/validation.html

BUG=312931985

Change-Id: Iafce62560bdd080cafb419af68acf24d86cdfc78
2023-12-01 00:45:05 +00:00
Owner Cleanup Bot
5928936a3c Remove lberki@google.com from OWNERS
This suggested change is automatically generated based on group
memberships and affiliations.
If this change is unnecessary or in error, vote CR -1 and the bot
will abandon it. Vote CR +1/2 to approve this change.

See the owner's recent activity for context:
https://android-review.googlesource.com/q/lberki@google.com

To report an issue, file a bug in the Infra>Codereview component.

Change-Id: Icd320d5ff1cf2bde24923f0f23d812e8299bd88d
2023-11-30 16:41:22 +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
6befb342fd Support aconfig dump --dedup
Add a flag to aconfig dump that will allow identical flags to be merged
without erroring.  This will allow merging the aconfig cache files from
dependencies for each module, which requires passing less data to Make
from Soong, and thus reduces the percentage of builds require Kati
analysis.

Bug: 313698230
Test: aconfig.test
Change-Id: Id2d9b78225720ce01defad4b13ea9395f6ab1033
2023-11-29 12:04:36 -08:00
Ted Bauer
5169faa366 Merge "aconfig: Add exported mode to aconfig Java library generation." into main am: df2b347f9f
Original change: https://android-review.googlesource.com/c/platform/build/+/2848173

Change-Id: I7a2ab31139f9a29dc4cc415207f7e37ad2802c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-29 18:59:21 +00:00
Ted Bauer
df2b347f9f Merge "aconfig: Add exported mode to aconfig Java library generation." into main 2023-11-29 18:23:10 +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