Skip to content

Commit 2947752

Browse files
committed
Adapt generic Halium device tree to Android 12 changes
Include both VNDK 30 and 31 (Android 12.1)
1 parent 7848a49 commit 2947752

2 files changed

Lines changed: 8 additions & 2 deletions

File tree

BoardConfig.mk

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ BOARD_VENDOR := halium
1818

1919
DEVICE_PATH := device/halium/halium_arm64
2020

21-
include build/make/target/board/generic_arm64_ab/BoardConfig.mk
21+
include build/make/target/board/generic_arm64/BoardConfig.mk
2222

2323
TARGET_USES_64_BIT_BINDER := true
2424

@@ -58,5 +58,7 @@ BOARD_VENDORIMAGE_PARTITION_SIZE := 314572800
5858
BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE := ext4
5959

6060
# Recovery
61-
BOARD_USES_RECOVERY_AS_BOOT := true
61+
BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT := true
6262
TARGET_RECOVERY_PIXEL_FORMAT := "RGBX_8888"
63+
64+
BUILD_BROKEN_MISSING_REQUIRED_MODULES := true

device.mk

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,13 @@ PRODUCT_COPY_FILES += \
2424
# Enable dynamic partition size
2525
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true
2626

27+
# VNDK
28+
PRODUCT_EXTRA_VNDK_VERSIONS := 31
29+
2730
# init scripts
2831
PRODUCT_PACKAGES += \
2932
init.disabled.rc \
33+
init.gsi.rc \
3034
init.halium.rc \
3135
vndk-detect \
3236
on-post-data.sh

0 commit comments

Comments
 (0)