StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
95,606 Commits 1 Branch 0 Tags
f877c1c7c4ea562e1313aed49e23d2502c31c27c
Commit Graph

36766 Commits

Author SHA1 Message Date
Dan Shi
f877c1c7c4 Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main am: e8519a7bad am: c0d94d179a am: 17391cba39 
Original change: https://android-review.googlesource.com/c/platform/build/+/2871792

Change-Id: I370421e6e101b3e5f078a6a7b86dc745ce7164b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 20:55:05 +00:00
Dan Shi
17391cba39 Merge "Revert "Allow to override fastboot-info.txt for specific board"" into main am: e8519a7bad am: c0d94d179a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2871792

Change-Id: I0a765845255a3eedfb86b0b92c174cbd1fe54d14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 20:23:04 +00:00
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
d63d6a7adb Merge "Allow to override fastboot-info.txt for specific board" into main am: aaf82ff626 am: 47abe8a42e am: a2191b0e4a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2871235

Change-Id: I607579e81d21af5982fc247bda504e245b84a128
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 04:25:17 +00:00
Dmitrii Merkurev
a2191b0e4a Merge "Allow to override fastboot-info.txt for specific board" into main am: aaf82ff626 am: 47abe8a42e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2871235

Change-Id: I9d11637bddf26fc2687fc494656d3e5d7b6afdab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-13 03:52:44 +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
9e746d2682 Merge "Revert "Fix the KNOWN_CODENAMES to include "L"."" into main am: 7c607a0e32 am: c15097fa2e am: b7d6f8c952 
Original change: https://android-review.googlesource.com/c/platform/build/+/2864057

Change-Id: I614619d59238e2daa098a04b30591a653e6271db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 23:29:03 +00:00
George Lin
b7d6f8c952 Merge "Revert "Fix the KNOWN_CODENAMES to include "L"."" into main am: 7c607a0e32 am: c15097fa2e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2864057

Change-Id: I9cac7c3f73010c52913822be2c46a82c8fcc2229
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-11 22:45:48 +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
253d79d3d4 Merge "Fix the KNOWN_CODENAMES to include "L"." into main am: d4a39894ca am: 428953becb am: db0c9c66a9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2865065

Change-Id: I1446b83d0b250cda2bfceed0c94e21b6640e8bc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-07 23:43:15 +00:00
Colin Cross
c41d03f12c Merge "Add --dedup flag to generate-partition-aconfig-flag-file" into main am: 2118e738b2 am: 6e838663c3 am: df0fa5de98 
Original change: https://android-review.googlesource.com/c/platform/build/+/2861369

Change-Id: Ic5ce4b678fb6001a65266bcd0e7127938157a663
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-07 23:42:56 +00:00
Treehugger Robot
db0c9c66a9 Merge "Fix the KNOWN_CODENAMES to include "L"." into main am: d4a39894ca am: 428953becb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2865065

Change-Id: I9695efea6c32301eeae6d6acdc156a993c136dc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-07 23:08:50 +00:00
Colin Cross
df0fa5de98 Merge "Add --dedup flag to generate-partition-aconfig-flag-file" into main am: 2118e738b2 am: 6e838663c3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2861369

Change-Id: I2a093152ca099a9e1433e2f6768182b09c9c685c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-07 23:08:30 +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
9843c389a2 Merge changes from topic "update-no-bionic-page-size" into main am: f28fa571d0 am: e8c4ae9094 am: 98ca0096e6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2859825

Change-Id: I0f5d348efdc7c24e4294440d782b413a65b1f922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-06 15:29:33 +00:00
Vilas Bhat
98ca0096e6 Merge changes from topic "update-no-bionic-page-size" into main am: f28fa571d0 am: e8c4ae9094 
Original change: https://android-review.googlesource.com/c/platform/build/+/2859825

Change-Id: Id6176bc9cef945e7618a4c577cf640dade239011
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-06 14:39:55 +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
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
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
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
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
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
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
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
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
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
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
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
da5132860e Merge "Don't install test data from Soong" into main am: 35ce86d65e am: 373496e27d am: 1696314ba9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2835093

Change-Id: I6da12aceb199651d571e7ac1ee384eed17cc4af4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-12-01 20:31:22 +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