Merge changes I8f20db07,Id3a8dd20,I0275a5d4 am: 6553fd6cad

am: 90cb321f88

Change-Id: I6df8c64d5fb0176b09e77eed0f90f569586814d5
This commit is contained in:
SzuWei Lin 2017-12-12 05:02:32 +00:00 committed by android-build-merger
commit 7494beccb3
2 changed files with 9 additions and 1 deletions

View File

@ -19,7 +19,6 @@
# VNDK
BOARD_VNDK_VERSION := current
BOARD_VNDK_RUNTIME_DISABLE := true
# Properties
TARGET_SYSTEM_PROP := build/make/target/board/treble_system.prop

View File

@ -26,6 +26,10 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
# Split selinux policy
PRODUCT_FULL_TREBLE_OVERRIDE := true
# vintf utility:
PRODUCT_PACKAGES += \
vintf
# The Messaging app:
# Needed for android.telecom.cts.ExtendedInCallServiceTest#testOnCannedTextResponsesLoaded
PRODUCT_PACKAGES += \
@ -63,6 +67,11 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \
netutils-wrapper-1.0
# Telephony:
# Provide a default APN configuration
PRODUCT_COPY_FILES += \
device/generic/goldfish/data/etc/apns-conf.xml:system/etc/apns-conf.xml
# Android Verified Boot (AVB):
# Builds a special vbmeta.img that disables AVB verification.
# Otherwise, AVB will prevent the device from booting the generic system.img.