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

35577 Commits

Author SHA1 Message Date
Cole Faust
a2cd1601df Merge "Revert^2 "Make the target_files zip reflect the recent partition change"" into main am: 00bf14b0f3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2758437

Change-Id: Icd045c1f6a439be7d31c07cf13a62e1a1a3f511a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 21:49:58 +00:00
Cole Faust
00bf14b0f3 Merge "Revert^2 "Make the target_files zip reflect the recent partition change"" into main 2023-09-25 21:07:57 +00:00
Cole Faust
cb63de55b7 Revert^2 "Make the target_files zip reflect the recent partition change" 
This reverts commit 612b362ca3.

Reason for revert: Excluding the failing product in ag/24856527

Change-Id: I28664302a7fd98ce9bd88e6ce9679b53846b1859
 2023-09-25 19:41:25 +00:00
Cole Faust
0e107dc3dd Merge "Add partition-related variables to soong_config.mk" into main am: 252e5a39fe 
Original change: https://android-review.googlesource.com/c/platform/build/+/2758047

Change-Id: I54361f5122d4d2bcbe9d678cbdefd7d60949c66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 18:09:20 +00:00
Cole Faust
252e5a39fe Merge "Add partition-related variables to soong_config.mk" into main 2023-09-25 17:08:34 +00:00
Bart Sears
06e9b5d7d7 Merge "Revert "Make the target_files zip reflect the recent partition change"" into main am: f576d31d62 
Original change: https://android-review.googlesource.com/c/platform/build/+/2761205

Change-Id: I79fbda1d1cf3011c8fdd363f1b59f1ba44b9ab78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-23 21:27:48 +00:00
Bart Sears
f576d31d62 Merge "Revert "Make the target_files zip reflect the recent partition change"" into main 2023-09-23 20:18:40 +00:00
Ed Tam
612b362ca3 Revert "Make the target_files zip reflect the recent partition change" 
This reverts commit 60061340a5.

Reason for revert: Breaking wifi/sim network connectivity
Bug: 301547660

Change-Id: I1ebf27613a3db8f88a060af2ccfe2a07b64bd7eb
 2023-09-23 05:24:41 +00:00
Cole Faust
2d90efb1a4 Add partition-related variables to soong_config.mk 
So that bp2build can use them to produce partition images.

Bug: 297269187
Test: m bazel_sandwich
Change-Id: Id7a13fe1d575e87fb901fb089fb79a5722c4923c
 2023-09-22 15:52:37 -07:00
Kiyoung Kim
4345d8fd20 Merge "Define llndk modules instead of vndk_package" into main am: a8c405f264 
Original change: https://android-review.googlesource.com/c/platform/build/+/2756025

Change-Id: Id0236f9d3f936532f9cf6d71f2630b85cd0450e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 02:49:35 +00:00
Kiyoung Kim
a8c405f264 Merge "Define llndk modules instead of vndk_package" into main 2023-09-22 02:15:35 +00:00
Alan Stokes
81b0c64650 Merge "Add a build-time flag for AVF permission change" into main am: c774b33c61 
Original change: https://android-review.googlesource.com/c/platform/build/+/2757405

Change-Id: Ie571050f06b7b72d5ee4f0928213950ccf02fb7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 09:43:02 +00:00
Alan Stokes
c774b33c61 Merge "Add a build-time flag for AVF permission change" into main 2023-09-21 08:42:54 +00:00
Kiyoung Kim
81923d1289 Define llndk modules instead of vndk_package 
vndk_package installs more than VNDK APEX, which includes LLNDK for
system and some core modules with vendor variant. This change adds a new
target llndk_in_system to instal LLNDK modules in the system image and
use this package if VNDK is deprecated

Bug: 299197187
Test: Cuttlefish and Cheetah boot succeeded without error
Change-Id: I9fe1114fdcb65c6143b5f734425c878a29138d0b
 2023-09-21 15:43:55 +09:00
Treehugger Robot
39b4166c95 Merge "Make the target_files zip reflect the recent partition change" into main am: ad30396b0e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2755427

Change-Id: Ia774c1bc53a257ebec365341a7b79e36c22cec9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 20:18:29 +00:00
Treehugger Robot
ad30396b0e Merge "Make the target_files zip reflect the recent partition change" into main 2023-09-20 19:40:01 +00:00
Cole Faust
60061340a5 Make the target_files zip reflect the recent partition change 
The target_files zip includes a copy of all the installed files.
It wasn't updated to match aosp/2746998, causing a discrepency between
the target files zip and what was actually on the device.

Bug: 205632228
Bug: 300267995
Test: m dist, then compared the list of files in out/dist/sdk_phone_x86_64-target_files-colefaust.zip before/after this cl
Change-Id: I825fe110285f4e9550b264dea162a4bd7c3daef6
 2023-09-20 18:33:02 +00:00
Treehugger Robot
070419f03a Merge "Add an execution check for BOARD_KERNEL_VERSION" into main am: bf69b90e77 
Original change: https://android-review.googlesource.com/c/platform/build/+/2755426

Change-Id: I91c5a518840b899a93521f1795a71b689e987eab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 04:17:23 +00:00
Kelvin Zhang
4a4bbda6e7 Add an execution check for BOARD_KERNEL_VERSION 
Make sure the specified BOARD_KERNEL_VERSION matches what we extract
from the kernel binary. As other parts of the build system might rely on
the kernel version.

Test: set BOARD_KERNERL_VERSION to foo, make sure build fails
Bug: 293313353
Change-Id: I9005d338fcc3dbb692a6ea7a518a5e63219b2c99
 2023-09-19 14:36:56 -07:00
Cole Faust
87e0fc95e9 Merge "Add ProductDirectory variable to soong_config.mk" into main am: b00035955c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2755206

Change-Id: Ie1df49e6d56ba0d67ffa863eebbbf7d6a06cddea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 21:16:34 +00:00
Cole Faust
b00035955c Merge "Add ProductDirectory variable to soong_config.mk" into main 2023-09-19 20:42:52 +00:00
Greg Kaiser
b79f1241b3 Merge "Revert "Give an error when trying to build "next" targets"" into main am: d5799abc55 
Original change: https://android-review.googlesource.com/c/platform/build/+/2751295

Change-Id: I0d0b0e6dd8038998b6babaf5eea28220350b199b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 20:24:10 +00:00
Greg Kaiser
d5799abc55 Merge "Revert "Give an error when trying to build "next" targets"" into main 2023-09-19 19:55:07 +00:00
Treehugger Robot
c3744daced Merge "Tidy AVF build-time flags" into main am: 106f7202d8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2754886

Change-Id: I8daa27e012a897c96f8e45bc9af2e88c49c12a9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 16:49:30 +00:00
Treehugger Robot
106f7202d8 Merge "Tidy AVF build-time flags" into main 2023-09-19 15:45:14 +00:00
Prashant Dubey
f442476158 Merge "Fix typos in METADATA.txt inside boot.zip" into main am: 7f8e4b5549 
Original change: https://android-review.googlesource.com/c/platform/build/+/2755026

Change-Id: Ia227b0e4236b1a3d1ec0747bd1342c01b6681e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 15:00:36 +00:00
Alan Stokes
eb6896a82f Add a build-time flag for AVF permission change 
Bug: 278765584
Test: Builds, with and without the flag enabled
Change-Id: I91c9cf136a534f37a6bd4f0375f86ae16b3e59dd
 2023-09-19 15:42:39 +01:00
Alan Stokes
efcd43d7e6 Tidy AVF build-time flags 
Sort into alphabetical order, to match the order in build_flags.bzl.

Fix a typo that then became obvious.

Bug: 278067832
Test: Builds, with and without flag enabled
Change-Id: I89ca6b3f96634ece089f86d69bd0b40fc074adff
 2023-09-19 15:05:58 +01:00
Cole Faust
c7dcd2629a Add ProductDirectory variable to soong_config.mk 
Bug: 297269187
Test: m nothing
Change-Id: Ib14ce9d911c86afb5bb770c4b05977021e771c0f
 2023-09-18 13:07:22 -07:00
Prashant Dubey
029a6159df Fix typos in METADATA.txt inside boot.zip 
Bug: 287652269
Test: m dist out/dist/boot.zip
Change-Id: I55313453393f7a5c3ec565c476722c5ee4d8fc38
 2023-09-18 18:27:50 +00:00
Yu Liu
7b09b7c614 Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: fc68cf4d45 
Original change: https://android-review.googlesource.com/c/platform/build/+/2745809

Change-Id: I096473fdcf27348d39e2b24031faec2c6c2cf0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 17:22:06 +00:00
Yu Liu
fc68cf4d45 Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main 2023-09-15 16:46:01 +00:00
Ted Bauer
8aa65dd354 Merge "Dump Aconfig flags pb file alongside textproto." into main am: 202eab9b14 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752625

Change-Id: I185ed112926cb95aa6082a1b1c5de195be538879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-15 15:33:17 +00:00
Greg Kaiser
6c1723254e Revert "Give an error when trying to build "next" targets" 
This reverts commit f5eaf3cff3.

Reason for revert: -next targets are now healthy
Bug: 294161396

Change-Id: Idd61fd65d59a90057db9d6909267f5550cd5b2fe
 2023-09-15 14:46:54 +00:00
Ted Bauer
202eab9b14 Merge "Dump Aconfig flags pb file alongside textproto." into main 2023-09-15 14:19:26 +00:00
Treehugger Robot
251a45040a Merge "Define PRODUCT_PRODUCT_VNDK_VERSION as current by default" into main am: 2a65d6a7e9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752225

Change-Id: I64f571b8c84d8facead888f3b55a89ecf67087ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-14 23:25:19 +00:00
Treehugger Robot
2a65d6a7e9 Merge "Define PRODUCT_PRODUCT_VNDK_VERSION as current by default" into main 2023-09-14 22:19:02 +00:00
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
Alyssa Ketpreechasawat
6e1c947d59 Merge "Add mainline_module_prebuilt_* in BLUEPRINT_INCLUDE_TAGS_ALLOWLIST." into main 2023-09-14 17:24:52 +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
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
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
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
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