Commit Graph

95630 Commits

Author SHA1 Message Date
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
b658611cce Merge "Use SOONG_STUB_VENDOR_LIBRARIES for vendor linker.config.pb" into main am: e47f6ffa2b am: 57dda5b52c am: fa95edd016
Original change: https://android-review.googlesource.com/c/platform/build/+/2855527

Change-Id: I39b0a71d9a00992c6c81645e2b73345b9a0ac2c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 07:43:22 +00:00
Treehugger Robot
fa95edd016 Merge "Use SOONG_STUB_VENDOR_LIBRARIES for vendor linker.config.pb" into main am: e47f6ffa2b am: 57dda5b52c
Original change: https://android-review.googlesource.com/c/platform/build/+/2855527

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

Change-Id: I901cb0f1d583c617137addba3c3c1afd55d6bd4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:56:24 +00:00
Seungjae Yoo
2c62e93092 Merge "Append pubkey of microdroid-vendor into avb prop of vendor_boot" into main am: 5d034ba5c0 am: ec702cae54 am: 1ef7782493
Original change: https://android-review.googlesource.com/c/platform/build/+/2856828

Change-Id: I85a603aa995dbe3dd0d24ce2e6a070ad61e88313
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:55:32 +00:00
Treehugger Robot
8f88a559f7 Merge "Use SOONG_STUB_VENDOR_LIBRARIES for vendor linker.config.pb" into main am: e47f6ffa2b am: cc2c31d146 am: af2d42d3b7
Original change: https://android-review.googlesource.com/c/platform/build/+/2855527

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

Change-Id: If7a635272ea4c013c412e9a42fb3e5c4f9439f67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:54:37 +00:00
Seungjae Yoo
6b73d7f9ed Merge "Append pubkey of microdroid-vendor into avb prop of vendor_boot" into main am: 5d034ba5c0 am: 9b83205f41 am: 6e4090f51e
Original change: https://android-review.googlesource.com/c/platform/build/+/2856828

Change-Id: I7e3b8416668cd587b20124e8f9c604fd57785210
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:54:22 +00:00
Treehugger Robot
57dda5b52c 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: I508f87a068319040d23a92626fe7aa4ab43769c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:19:59 +00:00
Colin Cross
be05c0e96a Merge "Fix test data to use my_test_data_file_pairs" into main am: faa072b97f am: ec6a3c914d
Original change: https://android-review.googlesource.com/c/platform/build/+/2842097

Change-Id: I70aaa7a93011a4df602a1f11ef94fcb0904ba095
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:07:43 +00:00
Seungjae Yoo
1ef7782493 Merge "Append pubkey of microdroid-vendor into avb prop of vendor_boot" into main am: 5d034ba5c0 am: ec702cae54
Original change: https://android-review.googlesource.com/c/platform/build/+/2856828

Change-Id: I03ba300cd3e87eba387c1ae37ff6dabb7bfde93c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:07:31 +00:00
Treehugger Robot
af2d42d3b7 Merge "Use SOONG_STUB_VENDOR_LIBRARIES for vendor linker.config.pb" into main am: e47f6ffa2b am: cc2c31d146
Original change: https://android-review.googlesource.com/c/platform/build/+/2855527

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

Change-Id: I1d7a275bbd59fa394e59e8464e1626cae2836323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:04:58 +00:00
Seungjae Yoo
6e4090f51e Merge "Append pubkey of microdroid-vendor into avb prop of vendor_boot" into main am: 5d034ba5c0 am: 9b83205f41
Original change: https://android-review.googlesource.com/c/platform/build/+/2856828

Change-Id: I30e11f0dbff1fc0e7652160151888c46aa0b4a4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 06:04:50 +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
Colin Cross
ec6a3c914d 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: I02767f44ebf22e318cf0540b517e9c44f69d74e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 05:49:55 +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
ec702cae54 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: Id7b5414cb9dc0a8d80dde76354b60b5dcf13ce62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 05:41:07 +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
Treehugger Robot
5ffecb9480 Merge "Define __ANDROID_VENDOR_API__" into main am: e4922b8796 am: 722836c170 am: dc64164a70
Original change: https://android-review.googlesource.com/c/platform/build/+/2851329

Change-Id: I3b29bd4173ff60501c10d322ad13399c1670165a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 05:16:43 +00:00
Yi-Yo Chiang
ea86cc497e Merge "releasetools: Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE" into main am: 7a519aebde am: 9047aa536a am: 14c1e811fe
Original change: https://android-review.googlesource.com/c/platform/build/+/2855526

Change-Id: I86d39139f3bc2b37efdada43b2dff7495fcae60c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 05:16:10 +00:00
Treehugger Robot
467ef5f462 Merge "Define __ANDROID_VENDOR_API__" into main am: e4922b8796 am: 348c30ec73 am: c7b9eb3b03
Original change: https://android-review.googlesource.com/c/platform/build/+/2851329

Change-Id: I366218085e43b27507430503d9847ad23ad4da17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 05:15:53 +00:00
Yi-Yo Chiang
0ca4aaba2f Merge "releasetools: Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE" into main am: 7a519aebde am: 690fdfd597 am: 0b258a3037
Original change: https://android-review.googlesource.com/c/platform/build/+/2855526

Change-Id: Ia31cc85a0587d989054d1dc6ff51c9a9aec092d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 05:15:16 +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
dc64164a70 Merge "Define __ANDROID_VENDOR_API__" into main am: e4922b8796 am: 722836c170
Original change: https://android-review.googlesource.com/c/platform/build/+/2851329

Change-Id: Ieb7a23127e50758f6f587a675ad15f723fe05fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 04:29:19 +00:00
Yi-Yo Chiang
14c1e811fe Merge "releasetools: Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE" into main am: 7a519aebde am: 9047aa536a
Original change: https://android-review.googlesource.com/c/platform/build/+/2855526

Change-Id: I6665d36181aa00a71c4ac22f08938a735d728479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 04:29:10 +00:00
Treehugger Robot
c7b9eb3b03 Merge "Define __ANDROID_VENDOR_API__" into main am: e4922b8796 am: 348c30ec73
Original change: https://android-review.googlesource.com/c/platform/build/+/2851329

Change-Id: Iec8b447128f9501733f4cceb33c3fa6239276205
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 04:27:13 +00:00
Yi-Yo Chiang
0b258a3037 Merge "releasetools: Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE" into main am: 7a519aebde am: 690fdfd597
Original change: https://android-review.googlesource.com/c/platform/build/+/2855526

Change-Id: Idb49f7b35bcce83c149badf0e004e5a7132f4b69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 04:26:49 +00:00
Treehugger Robot
722836c170 Merge "Define __ANDROID_VENDOR_API__" into main am: e4922b8796
Original change: https://android-review.googlesource.com/c/platform/build/+/2851329

Change-Id: I88ad1748ebc79a63933cf3ef9c5b88b6ca9ca5ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 04:08:31 +00:00
Yi-Yo Chiang
9047aa536a 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: Id494ce0e91514c8ecacc7926c5b8bac6142e43c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 04:07:44 +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
db572ec6a0 Merge "Add the next release to Class2NonSdkList." into main am: 2f9162f1cb am: 45b73c3294 am: 0fadee83b4
Original change: https://android-review.googlesource.com/c/platform/build/+/2858125

Change-Id: I82ec5b127f75bd8b2337cab7667ee7deadf0fb1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 02:19:44 +00:00
Colin Cross
595253b42b Merge "Simplify module-info.json by leaving out optional fields" into main am: 8bb8482755 am: 2758ef4c91 am: b9d17b97fe
Original change: https://android-review.googlesource.com/c/platform/build/+/2835094

Change-Id: Ic387b04420be3dafd1906c70c83938475e385765
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 02:19:08 +00:00
Treehugger Robot
53477c86e0 Merge "Add the next release to Class2NonSdkList." into main am: 2f9162f1cb am: 0ecfef4423 am: efe2a3408d
Original change: https://android-review.googlesource.com/c/platform/build/+/2858125

Change-Id: I52fae823f4c3e22f507123c188923a5b56d2725b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 02:18:32 +00:00
Treehugger Robot
0fadee83b4 Merge "Add the next release to Class2NonSdkList." into main am: 2f9162f1cb am: 45b73c3294
Original change: https://android-review.googlesource.com/c/platform/build/+/2858125

Change-Id: I4fe4645874cc6fa6a4e9008b9b3bd2832f8047b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 02:15:55 +00:00
Colin Cross
23a54e11ab Merge "Simplify module-info.json by leaving out optional fields" into main am: 8bb8482755 am: 78c9696aea am: 84035d9743
Original change: https://android-review.googlesource.com/c/platform/build/+/2835094

Change-Id: Id7f1e3dd8f568cf1cd173cde59d8cb7a558535e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 02:15:45 +00:00
Colin Cross
b9d17b97fe Merge "Simplify module-info.json by leaving out optional fields" into main am: 8bb8482755 am: 2758ef4c91
Original change: https://android-review.googlesource.com/c/platform/build/+/2835094

Change-Id: I68ef989fbcff9298e73e032f93e82640038fe4a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 02:14:33 +00:00
Treehugger Robot
efe2a3408d Merge "Add the next release to Class2NonSdkList." into main am: 2f9162f1cb am: 0ecfef4423
Original change: https://android-review.googlesource.com/c/platform/build/+/2858125

Change-Id: Iab0ca956f230c72f58ca52b7ad9dabc3489dd13d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 01:44:29 +00:00
Colin Cross
84035d9743 Merge "Simplify module-info.json by leaving out optional fields" into main am: 8bb8482755 am: 78c9696aea
Original change: https://android-review.googlesource.com/c/platform/build/+/2835094

Change-Id: I9c6b9e156f07897e8f0c433a90942e729939f691
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05 01:43:57 +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