Oriol Prieto Gascó
b8ab3aa4cd
Merge "Add container field to flag_declarations" into main am: 6344fdf9a6 am: 073e0b798f
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2843433
Change-Id: I19e611384fcaa97840ea3c8b189c3342c976d762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-05 13:12:47 +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
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
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
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
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
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
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
Treehugger Robot
0ecfef4423
Merge "Add the next release to Class2NonSdkList." into main am: 2f9162f1cb
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2858125
Change-Id: I0add0815f0d50b5f9fd80234f9a2e8eaa9991a09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-05 01:22:26 +00:00
Colin Cross
78c9696aea
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: Ica862ae2ab0e0433a1ce88589b835abe0e07173c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-05 01:09:23 +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
d8dfd26cd6
Merge "Don't install test data from Soong" into main am: 35ce86d65e am: 949199ec49
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2835093
Change-Id: I256db104436efffc78c271b40485432a75b0f246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 19:59:50 +00:00
Colin Cross
1696314ba9
Merge "Don't install test data from Soong" into main am: 35ce86d65e am: 373496e27d
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2835093
Change-Id: I874290ba2d5fc797c844074cfcc068f7c110ac00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 19:57:02 +00:00
Colin Cross
949199ec49
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: I26e688258633549d6666bf96dc8aa3665a76bf69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 19:35:37 +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
bc01e6ebdb
[automerger skipped] Merge "build(nfc): Create framework-nfc sdk library" into main am: 999d9a1924 am: d2f4f984cf -s ours
...
am skip reason: Merged-In I4b9901d2b3924157caebad0d083c4beacbad9749 with SHA-1 58f0337f22 is already in history
Original change: https://android-review.googlesource.com/c/platform/build/+/2828697
Change-Id: Ie155f7c9768c51fdecbf5d00f3a721b8f7bad1fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 18:49:18 +00:00
Roshan Pius
b428d2b580
Merge "build(nfc): Create framework-nfc sdk library" into main am: 999d9a1924 am: 0cf3c25189
...
Original change: https://android-review.googlesource.com/c/platform/build/+/2828697
Change-Id: I7e73e323708527297466eacc4404457432304fc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 18:33:49 +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
0cf3c25189
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: I408cf06d756d0c767c90840dd7bcdc1fb6e5ae37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-12-01 18:09:23 +00:00