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

89540 Commits

This Branch
This Branch
All Branches
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
Mårten Kongstad
7b6140d97d Merge "printflags: introduce device tool to print feature flags" into main am: 28a79fe319 
Original change: https://android-review.googlesource.com/c/platform/build/+/2759750

Change-Id: I7f6a2569465e4f2b2f672b88c320a60b74734650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 07:17:31 +00:00
Mårten Kongstad
28a79fe319 Merge "printflags: introduce device tool to print feature flags" into main 2023-09-25 06:51:18 +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
Treehugger Robot
38112357ab Merge "emulator_arm64: Revert TARGET_NO_KERNEL to emulator default" into main am: 50b8e4fb0d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2759532

Change-Id: I291da664bbca6a0e6661a2befbf0dc90e24592c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 23:32:03 +00:00
Treehugger Robot
50b8e4fb0d Merge "emulator_arm64: Revert TARGET_NO_KERNEL to emulator default" into main 2023-09-22 23:07:26 +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
Treehugger Robot
fb80ce539e Merge "aconfig: separate package name and flag name using dot" into main am: 2ee29fdf7f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2760466

Change-Id: If2bba1ed1cb056ec4f60067a6ba48a1688db3f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-22 15:26:01 +00:00
Treehugger Robot
2ee29fdf7f Merge "aconfig: separate package name and flag name using dot" into main 2023-09-22 14:59:21 +00:00
Mårten Kongstad
7fa3cb176c aconfig: separate package name and flag name using dot 
Change the package name and flag name separator in the text dump output
from a slash to a dot. This makes the output consistent with how the
flags are encoded in the API tracking files.

Bug: 283910447
Test: atest aconfig.test
Change-Id: Ie3e109073e7f04cf01568e16c29bf2872d07ebad
 2023-09-22 13:52:40 +02:00
Mårten Kongstad
433fab94c8 printflags: introduce device tool to print feature flags 
Metadata about all feature flags used on device are located in
/<partition>/etc/aconfig_flags.pb. Add a new tool, printflags, to read
and pretty-print these files.

printflags is only intended for debugging purposes.

Bug: 301547297
Test: adb shell printflags
Change-Id: I0a3277fecfc8a60eea0aa6bf362a25a311360b71
 2023-09-22 13:47:49 +02: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
Tomislav Novak
1af7e1fa7f emulator_arm64: Revert TARGET_NO_KERNEL to emulator default 
With TARGET_NO_KERNEL set to false, sdk_phone_arm64 build depends on
$PRODUCT_OUT/kernel, which no longer exists as of aosp/2548555 ("Cleanup
in emulator_arm64/device.mk").

$ lunch sdk_phone_arm64-eng && m
[...]
FAILED: ninja: 'out/target/product/emulator_arm64/kernel', needed by
  'out/target/product/emulator_arm64/boot.img', missing and no known
  rule to make it

Goldfish makefiles copy prebuilt kernels to $OUT/kernel-ranchu that
the emulator then uses, so no need to generate the boot image.

Test: lunch sdk_phone_arm64-eng && m
Change-Id: I3598ac04b352fc07679315ced4f7b7a536ccb5a5
 2023-09-21 14:49:56 -07: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
Kiyoung Kim
b51cfc63a5 Merge "Move vendor module into base_vendor" into main am: c6d30d3b9b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2758605

Change-Id: I8b90699fe82c582e94c2533eb0438d2b9e4f990a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-21 06:07:10 +00:00
Kiyoung Kim
c6d30d3b9b Merge "Move vendor module into base_vendor" into main 2023-09-21 05:03:58 +00:00
Kiyoung Kim
5959c0200d Move vendor module into base_vendor 
There is a vendor module android.hidl.memory@1.0-impl.vendor which is
defined in the base_system. Based on the definition of base_system.mk
and base_vendor.mk, this module is better to be located in the
base_vendor.mk. This change moves the module from base_system into
base_vendor.

Bug: 301344301
Test: Cuttlefish build succeeded
Change-Id: I6dba5ec2380028b1b2c629f901db996c518e3f72
 2023-09-21 10:32:50 +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
8370a90e0f Merge "Move auto_gen_test_config.py to argparse." into main am: badadf9c4b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2756029

Change-Id: Ifd79709be40665ddd7fdc9c62bfc74d917bf3b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 10:30:50 +00:00
Treehugger Robot
badadf9c4b Merge "Move auto_gen_test_config.py to argparse." into main 2023-09-20 09:44:11 +00:00
Treehugger Robot
948d449316 Merge "Add support for TARGET_BOARD_INFO_FILES" into main am: 331fb9c708 
Original change: https://android-review.googlesource.com/c/platform/build/+/2755629

Change-Id: Ibe1dda6123ec55240fbf8dc525a6a1ca89f528cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-20 06:56:43 +00:00
Treehugger Robot
331fb9c708 Merge "Add support for TARGET_BOARD_INFO_FILES" into main 2023-09-20 06:07:30 +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
Treehugger Robot
bf69b90e77 Merge "Add an execution check for BOARD_KERNEL_VERSION" into main 2023-09-20 03:01:32 +00:00
LaMont Jones
e61610d31a Add support for TARGET_BOARD_INFO_FILES 
This makes it so that portions of android-info.txt can come from
different sources.

Bug: b/301141632
Test: manual
Change-Id: I82793b37162f52805db425b802a2e0762526bd91
 2023-09-19 23:06:39 +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
Prashant Dubey
7f8e4b5549 Merge "Fix typos in METADATA.txt inside boot.zip" into main 2023-09-19 14:26:19 +00: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
Jingwen Chen
4bccadd460 Move auto_gen_test_config.py to argparse. 
Follow up to aosp/2752414

Test: atest-dev auto_gen_test_config_test
Change-Id: I401c6213f0ed5e97eb97b1c603a8b6c5286f0d88
 2023-09-19 06:36:19 +00:00
Jooyung Han
a60ddcab86 Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: Ib2e535c0a3991f4d58c3a0480ee3373eaa62894d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-19 01:50:44 +00:00
Jooyung Han
4f6eb3112f Merge "Revert^2 "Install CAS HAL APEX"" into main 2023-09-19 01:18:07 +00:00