Snap for 7818222 from d74e00e3c898e61552e32e8ad7c9dd5194181f58 to tm-release
Change-Id: I0861df53ebfda36380a018888fc94a48c4c89e98
This commit is contained in:
commit
f6742e92f5
3 changed files with 10 additions and 5 deletions
|
@ -422,4 +422,10 @@ BOARD_KERNEL_CMDLINE += at24.write_timeout=100
|
||||||
# Enable larger logbuf
|
# Enable larger logbuf
|
||||||
BOARD_KERNEL_CMDLINE += log_buf_len=1024K
|
BOARD_KERNEL_CMDLINE += log_buf_len=1024K
|
||||||
|
|
||||||
|
# Protected VM firmware
|
||||||
|
BOARD_PREBUILT_PVMFWIMAGE := packages/modules/Virtualization/pvmfw/pvmfw.img
|
||||||
|
BOARD_PVMFWIMAGE_PARTITION_SIZE := 0x00100000
|
||||||
|
# TODO(ptosi): Delete this variable once AOSP starts using the other one
|
||||||
|
BOARD_PVMFWIMG_PARTITION_SIZE = $(BOARD_PVMFWIMAGE_PARTITION_SIZE)
|
||||||
|
|
||||||
-include vendor/google_devices/gs101/proprietary/BoardConfigVendor.mk
|
-include vendor/google_devices/gs101/proprietary/BoardConfigVendor.mk
|
||||||
|
|
|
@ -1068,9 +1068,9 @@ PRODUCT_PACKAGES += \
|
||||||
vendor.samsung_slsi.hardware.tetheroffload@1.1-service
|
vendor.samsung_slsi.hardware.tetheroffload@1.1-service
|
||||||
|
|
||||||
# pKVM
|
# pKVM
|
||||||
|
$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
|
||||||
|
PRODUCT_BUILD_PVMFW_IMAGE := true
|
||||||
ifeq ($(TARGET_PKVM_ENABLED),true)
|
ifeq ($(TARGET_PKVM_ENABLED),true)
|
||||||
$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
|
|
||||||
PRODUCT_BUILD_PVMFW_IMAGE := true
|
|
||||||
PRODUCT_PACKAGES += pkvm_enabler
|
PRODUCT_PACKAGES += pkvm_enabler
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -16,6 +16,5 @@ LIBFPC_NAME=libfpcmulti_debug.a
|
||||||
FPC_CONFIG_DEBUG=1
|
FPC_CONFIG_DEBUG=1
|
||||||
FPC_CONFIG_ENGINEERING=1
|
FPC_CONFIG_ENGINEERING=1
|
||||||
|
|
||||||
#
|
# Google config
|
||||||
# File included from device/<manufacture>/<>/<device>.mk
|
GOOGLE_CONFIG_FP_STATUS=1
|
||||||
# Packages to include into the build
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue