Commit Graph

35747 Commits

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

Change-Id: I9b9e62c073286cd3499dd9471c7491485a773efd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 22:48:06 +00:00
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
2ed335ad17 Merge "Add partition-related variables to soong_config.mk" into main am: 252e5a39fe am: 0e107dc3dd
Original change: https://android-review.googlesource.com/c/platform/build/+/2758047

Change-Id: Id531962e18408214891d58743ad3845e814421d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-25 19:08:58 +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
54cbd895fc Merge "Revert "Make the target_files zip reflect the recent partition change"" into main am: f576d31d62 am: 06e9b5d7d7
Original change: https://android-review.googlesource.com/c/platform/build/+/2761205

Change-Id: I6959ca794af534b86960fe222e07b4a92e63f191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-23 22:26:56 +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
c85717900d Merge "Define llndk modules instead of vndk_package" into main am: a8c405f264 am: 4345d8fd20
Original change: https://android-review.googlesource.com/c/platform/build/+/2756025

Change-Id: I925f784a78aafe450d6fd11733b053c0fc950cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-22 03:46:23 +00: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
Roman Yepishev
fe63f28bd9 DO NOT MERGE Designate udc-dev-*-plus-aosp as UDC
Ignore-AOSP-First: The UDC designation only applies to udc-* branches.

Bug: 297873435
Change-Id: If49ce93abe63ad4e624a00454fcb3aa712f2d976
2023-09-21 15:52:16 +00:00
Alan Stokes
86333ce660 Merge "Add a build-time flag for AVF permission change" into main am: c774b33c61 am: 81b0c64650
Original change: https://android-review.googlesource.com/c/platform/build/+/2757405

Change-Id: Iebccbb0eb3c2552bc3273cc7113882c586dda5dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-21 10:40:09 +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
2e60b5f21b Merge "Make the target_files zip reflect the recent partition change" into main am: ad30396b0e am: 39b4166c95
Original change: https://android-review.googlesource.com/c/platform/build/+/2755427

Change-Id: I2f213d22c902ad8f47a0cae0055f48362c970a1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 21:16:48 +00: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
9d5aebc047 Merge "Add an execution check for BOARD_KERNEL_VERSION" into main am: bf69b90e77 am: 070419f03a
Original change: https://android-review.googlesource.com/c/platform/build/+/2755426

Change-Id: I301e56dc83120e5ce8ac70368c9cc28f655e6fd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 05:15:33 +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
0cfbf4ef21 Merge "Add ProductDirectory variable to soong_config.mk" into main am: b00035955c am: 87e0fc95e9
Original change: https://android-review.googlesource.com/c/platform/build/+/2755206

Change-Id: I394c156d1b366b81d41b29b4ea6e84240579fe88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 21:21:59 +00:00
Greg Kaiser
4e7ba89ccc Merge "Revert "Give an error when trying to build "next" targets"" into main am: d5799abc55 am: b79f1241b3
Original change: https://android-review.googlesource.com/c/platform/build/+/2751295

Change-Id: I112aa2321ba3ea1857068de60660f787ed9b2fd1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 21:21:25 +00: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
31cbb405eb Merge "Tidy AVF build-time flags" into main am: 106f7202d8 am: c3744daced
Original change: https://android-review.googlesource.com/c/platform/build/+/2754886

Change-Id: I9ff46c2d69684612a7ad00c7a79e212e2f0bc4d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 17:47:51 +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
Prashant Dubey
2673f2960a Merge "Fix typos in METADATA.txt inside boot.zip" into main am: 7f8e4b5549 am: f442476158
Original change: https://android-review.googlesource.com/c/platform/build/+/2755026

Change-Id: I1be77e218d2747bc96539766ae1917064fd7c0b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 15:59:18 +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
d42b9ba0b3 Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: fc68cf4d45 am: 7b09b7c614
Original change: https://android-review.googlesource.com/c/platform/build/+/2745809

Change-Id: I49ff58524f42faf34d4758708ca615db69836b11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 17:27:13 +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
b0ab57ad27 Merge "Dump Aconfig flags pb file alongside textproto." into main am: 202eab9b14 am: 8aa65dd354
Original change: https://android-review.googlesource.com/c/platform/build/+/2752625

Change-Id: I521468490f844718e8ee5cdff77754f139c68ca2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 16:32:22 +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
014c021972 Merge "Define PRODUCT_PRODUCT_VNDK_VERSION as current by default" into main am: 2a65d6a7e9 am: 251a45040a
Original change: https://android-review.googlesource.com/c/platform/build/+/2752225

Change-Id: Ic885f668524fdcc1f0c87f0af2f00215694bc0eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 00:25:06 +00:00