StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,516 Commits 1 Branch 0 Tags
b51cfc63a5c2f6b9f58873241d7a79efa6e5c10c
Commit Graph

89516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alyssa Ketpreechasawat
b46d79b745 Merge "Add mainline_module_prebuilt_* in BLUEPRINT_INCLUDE_TAGS_ALLOWLIST." into main am: 6e1c947d59 
Original change: https://android-review.googlesource.com/c/platform/build/+/2750122

Change-Id: I22964d6f3dadd10c2e93fb08c4ad86e31e0eb7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 18:06:59 +00:00
Dennis Shen
a1de8fd435 aconfig: Fix missing header in the generated c/cpp code 
Test: atest aconfig.test
Change-Id: I0c23299ad366cb5c61b84b738dd9e6bf3428435c
 2023-09-14 17:40:13 +00:00
Alyssa Ketpreechasawat
6e1c947d59 Merge "Add mainline_module_prebuilt_* in BLUEPRINT_INCLUDE_TAGS_ALLOWLIST." into main 2023-09-14 17:24:52 +00:00
Kousik Kumar
ec5416c9ad Add cog setup scripts 
This script has the following functionality:
1. Sets up the `out` symlink to point to a default location on disk
2. Copies RBE binaries outside Cog (temporary fix for build stall problem) - b/289391270
3. Exports ANDROID_BUILD_ENVIRONMENT_CONFIG variable to point to googler-cog.json file. This file will be available in aosp-main-with-phones and goog/main and downstream branches.

TESTED=ran the script within and outside the Cog workspace to test it.

Bug: b/295053716
Change-Id: I59cd6d2d5f954be6f7e4ecd7d64de1e63e51b72e
 2023-09-14 17:11:45 +00:00
Ted Bauer
98bedd8854 Dump Aconfig flags pb file alongside textproto. 
Bug: 299907996
Test: manually confirmed that pb file is gen'd and cp'd to device
Change-Id: I8e5c7bb8b1ad234bd6f0dba4de1cbe3fe1df19ae
 2023-09-14 15:28:12 +00:00
Jooyung Han
72187661c3 Revert^2 "Install CAS HAL APEX" 
5d6da97ed0

Change-Id: Ic621583ff1ee1c3eefb6caeff77d950f2e08e1e1
 2023-09-14 13:31:55 +00:00
Justin Yun
9ccc880aa6 Define PRODUCT_PRODUCT_VNDK_VERSION as current by default 
It has been mandatory since Android 11 (rvc) launching devices. Now we
can enable the product variants by default to all devices.

Bug: 300371698
Test: TH
Change-Id: I6b2d2e8e105ca35c38db8132486b1cb3bdbab40f
 2023-09-14 13:11:46 +00:00
Zhi Dou
73a34ce10a aconfig: throw exception if reading from DeviceConfig fails 
Reading value from DeviceConfig may fail if the provider is not ready.
Since DeciceConfig, and Settings class are static wrapper on top of
the provider, it won't cause the instance  initialization issue.
Thus when the issue happens it means the provider is not initialized.

Test: atest aconfig.test.java and manually make a change in the
framework and check the exception message
Bug: 299471646

Change-Id: Ic08d7a9cd32a8810a7274b6d93c249abccb50b9e
 2023-09-14 13:00:45 +00:00
Sebastian Pickl
f4ce61774a Merge "Revert "Install CAS HAL APEX"" into main am: 91646be0a5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2751048

Change-Id: I0d3225691bfe3fe1f471ba49ad5e0fdc21ef6d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 12:37:00 +00:00
Sebastian Pickl
91646be0a5 Merge "Revert "Install CAS HAL APEX"" into main 2023-09-14 12:26:38 +00:00
Sebastian Pickl
5d6da97ed0 Revert "Install CAS HAL APEX" 
Revert submission 2742398-cas-apex

Reason for revert: culprit for flake b/300311777, verified with go/abtd with 15 runs to make sure the flake is gone https://android-build.googleplex.com/builds/abtd/run/L46500000963034919

Bug:300311777

Change-Id: I2b566413ac1869f9bf3e974da7d84662047e436a
 2023-09-14 12:25:49 +00:00
Alyssa Ketpreechasawat
8894e1f02e Add mainline_module_prebuilt_* in BLUEPRINT_INCLUDE_TAGS_ALLOWLIST. 
The newly added mainline_module_prebuilt_nightly and mainline_module_prebuilt_monthly_release are possible values for RELEASE_MAINLINE_MODULE_PREBUILT_VERSION (build flag in trunk stable). By adding these in BLUEPRINT_INCLUDE_TAGS_ALLOWLIST, we would be able to choose mainline modules prebuilts (apks) based on release config.

Bug: 294969202
Test: DEFAULT_MODULE_BUILD_FROM_SOURCE=false m (with 2 versions of apks, different blueprint_package_includes)
Change-Id: Ifcc49e5499d4659b73179fff715945cd2e3ca4fa
 2023-09-14 11:08:20 +00:00
Treehugger Robot
a61ed55d48 Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635 
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I9eec8eed73fe4f3e816765ef59cff2e612f2c679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 00:43:18 +00:00
Treehugger Robot
1e042d4635 Merge "Do not freeze VNDK in trunk stable" into main 2023-09-14 00:16:18 +00:00
Cole Faust
a1e610a819 Merge "Change default logging level to WARNING" into main am: 386470f7d7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2748498

Change-Id: Ie6a43959c180245efbeb513fad67da919b2447fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 21:17:35 +00:00
Cole Faust
386470f7d7 Merge "Change default logging level to WARNING" into main 2023-09-13 20:22:22 +00:00
Cole Faust
7d5f7352c0 Merge "Mention LOCAL_POST_INSTALL_CMD when talking about BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: b870b9c933 
Original change: https://android-review.googlesource.com/c/platform/build/+/2748497

Change-Id: Iac1000a5ac31b6f88bef2a2a81f74dd123144e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 18:50:27 +00:00
Cole Faust
b870b9c933 Merge "Mention LOCAL_POST_INSTALL_CMD when talking about BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main 2023-09-13 18:08:22 +00:00
Colin Cross
cbc3ace1db Merge "Update LOCAL_JAVA_LANGUAGE_VERSION logic to match Soong" into main am: 708dc5bf81 
Original change: https://android-review.googlesource.com/c/platform/build/+/2748842

Change-Id: I1d7c1ae71a916ab497a0ee8ba81b89718922fa37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 18:01:14 +00:00
Colin Cross
708dc5bf81 Merge "Update LOCAL_JAVA_LANGUAGE_VERSION logic to match Soong" into main 2023-09-13 16:48:35 +00:00
Mårten Kongstad
7fca45d34a Merge "aconfig: explicitly @hide FLAG_ constants" into main am: 65d19d1403 
Original change: https://android-review.googlesource.com/c/platform/build/+/2748397

Change-Id: I82cd8383c2578a30cfb1b25dd9000345537a560a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 13:04:51 +00:00
Mårten Kongstad
65d19d1403 Merge "aconfig: explicitly @hide FLAG_ constants" into main 2023-09-13 11:58:22 +00:00
Mårten Kongstad
fb10840da5 aconfig: explicitly @hide FLAG_ constants 
Because of a bug in metalava [1], the flag constants are incorrectly
considered not-hidden when metalava generates the API signature files.
This means the FLAG_ constant name will be used, instead of the FLAG_
constant value, which is what we want.

While waiting for b/300211291 to be fixed, explicitly mark the FLAG_
constants as hidden (and keep marking the classes as such).

This CL can be reverted when b/300211291 is fixed.

1. Item.isHiddenOrRemoved does not check if its parent item is hidden,
   tracked in b/300211291

Bug: 297881670
Test: atest aconfig.test aconfig.test.java
Change-Id: I05de8344ccb424bee51c39f9609489ad312397ce
 2023-09-13 10:15:01 +02:00
Daniel Zheng
ccb5ade512 Merge "remove --apply-vbmeta from vbmeta_vendor" into main am: 2860f5f574 
Original change: https://android-review.googlesource.com/c/platform/build/+/2747219

Change-Id: I600baab15b26c6215c4550fb5711019ab7121d8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 07:58:34 +00:00
Daniel Zheng
2860f5f574 Merge "remove --apply-vbmeta from vbmeta_vendor" into main 2023-09-13 07:26:43 +00:00
Colin Cross
82df516665 Update LOCAL_JAVA_LANGUAGE_VERSION logic to match Soong 
Support LOCAL_JAVA_LANGUAGE_VERSION := 11 or 17 and match the default value of 17 used
in Soong.

Bug: 298613711
Bug: 299937334
Test: m javac-check
Change-Id: I19aa24cc5197ab0e6cb03361124c36ce3e316810
 2023-09-13 04:53:17 +00:00
Justin Yun
e9525900e5 Do not freeze VNDK in trunk stable 
VNDK will be frozen only if the VNDK version is less than or equal to
34. Otherwize do not freeze the VNDK libraries.

Bug: 297542516
Bug: 299867815
Test: lunch cf_x86_64_phone-next-userdebug; m
Change-Id: Icdd288f65c5f7bdb5b4899c8e96820c2a147a011
 2023-09-13 13:07:34 +09:00
Jooyung Han
1565036d44 Merge "Install CAS HAL APEX" into main am: be6ba681e9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2742398

Change-Id: Id2497994e483a95339bdf6d04ea939d5981e6b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-13 01:20:22 +00:00
Jooyung Han
be6ba681e9 Merge "Install CAS HAL APEX" into main 2023-09-13 00:51:34 +00:00
Cole Faust
98142f8446 Change default logging level to WARNING 
To avoid spam in the build.

Test: Presubmits
Change-Id: I45db6cd92babda7f83582fd438210cae02c54708
 2023-09-12 17:39:47 -07:00
Cole Faust
c6a0d4dd2c Mention LOCAL_POST_INSTALL_CMD when talking about BUILD_BROKEN_INCORRECT_PARTITION_IMAGES 
Bug: 205632228
Test: None
Change-Id: I9eda7de5cf48881f8bbe1404ee1a17deb2608c61
 2023-09-12 16:54:19 -07:00
Daniel Zheng
ba67aa4aee remove --apply-vbmeta from vbmeta_vendor 
Removing this flag as --apply-vbmeta should only be used for root vbmeta
partitions.

Test: m fastboot_info, fastboot flashall
Bug: 299440104
Change-Id: I4910008635b16c4f4194ebd45da26bd1a8875fc1
 2023-09-12 09:43:09 -07:00
Alice Wang
a8bbb12336 Merge "[avf] Add build-time flag for pVM remote attestation" into main am: 4f4f965f38 
Original change: https://android-review.googlesource.com/c/platform/build/+/2745403

Change-Id: Ia85cf199ef6b565ab82a5f50dba5b04dbbca637f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-12 08:49:26 +00:00
Alice Wang
4f4f965f38 Merge "[avf] Add build-time flag for pVM remote attestation" into main 2023-09-12 07:55:50 +00:00
Jooyung Han
3b80ef8f49 Merge "Run apex_sepolicy_tests for all installed APEXes" into main am: f3c3f40c3b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2745257

Change-Id: I9f0ae655a6b817aabbcd2dc83b757fef08b82f42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 22:59:02 +00:00
Jooyung Han
f3c3f40c3b Merge "Run apex_sepolicy_tests for all installed APEXes" into main 2023-09-11 22:30:20 +00:00
Daniel Zheng
df05d52d18 Merge "Turn on fastboot-info for img_from_target_files" into main am: d6178ee812 
Original change: https://android-review.googlesource.com/c/platform/build/+/2747057

Change-Id: I5354fff420dddb8998a81c8ab1132462460cc200
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 22:08:24 +00:00
Daniel Zheng
d6178ee812 Merge "Turn on fastboot-info for img_from_target_files" into main 2023-09-11 21:05:36 +00:00
Cole Faust
ab7ddf8f20 Merge "Clean staging dirs in build_image.py" into main am: 548775d247 
Original change: https://android-review.googlesource.com/c/platform/build/+/2746998

Change-Id: I6f1b97ba49fe1bb083ec9d520b5955bbd8580efe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 18:07:50 +00:00
Yu Liu
d793c271c3 Support aconfig_declarations, aconfig_values and aconfig_value_set 
Bug: 297356603
Test: Unit tests
Change-Id: Iefa0e056cd6185499ffa92492b261c31a5d27af2
 2023-09-11 10:57:16 -07:00
Cole Faust
548775d247 Merge "Clean staging dirs in build_image.py" into main 2023-09-11 17:25:19 +00:00
Daniel Zheng
89a85ba933 Turn on fastboot-info for img_from_target_files 
Use fastboot-info for fastboot update

Test: m update_package
Bug: 299854419
Change-Id: I9f7c93f8309a2c136ee81cad1391f93b2feb8156
 2023-09-11 09:58:32 -07:00
Gurpreet Singh
7f5607474c Merge "Add OWNERS for sdk extensions version updates" into main am: a2d9728449 
Original change: https://android-review.googlesource.com/c/platform/build/+/2743417

Change-Id: Ie6516b5212459c52090dba9b88c1989644585bec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 14:53:59 +00:00
Mårten Kongstad
6644d9fbe7 Merge "Revert "Revert "aconfig: @hide generated Java code""" into main am: 72c3b38a1d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2745644

Change-Id: I8af4c28f0388bafa543112a406a2082b6a0b9814
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 14:53:43 +00:00
Gurpreet Singh
a2d9728449 Merge "Add OWNERS for sdk extensions version updates" into main 2023-09-11 14:30:11 +00:00
Mårten Kongstad
72c3b38a1d Merge "Revert "Revert "aconfig: @hide generated Java code""" into main 2023-09-11 14:08:55 +00:00
Treehugger Robot
bd427b16e4 Merge "aconfig: remove unnecessary clones" into main am: 1ee8f4d232 
Original change: https://android-review.googlesource.com/c/platform/build/+/2745641

Change-Id: I56c58fc168543e844c723d0bbcd29f6b15fa4d51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 13:17:34 +00:00
Treehugger Robot
1ee8f4d232 Merge "aconfig: remove unnecessary clones" into main 2023-09-11 12:51:17 +00:00
Mårten Kongstad
65efa27f71 Revert "Revert "aconfig: @hide generated Java code"" 
This reverts commit c0e8ffea41.

Reason for revert: The detected build breakage was unrelated to the aconfig change. Details in b/297881670#comment11.

Change-Id: Ia32bc2e796ed3de7fa049c2c2db340f4325a2853
 2023-09-11 12:17:25 +00:00
Mårten Kongstad
fa7b2ec189 Merge "Revert "aconfig: @hide generated Java code"" into main am: 4afc5d7b2b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2745642

Change-Id: Ib64656b57b1d7118a4718c41f46857b9c694db33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-11 11:45:00 +00:00