StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I8f20db07,Id3a8dd20,I0275a5d4

Browse Source 
am: 6553fd6cad

Change-Id: I1e54f781f0ea3929200ecb3505ec71cb0ad30b99
This commit is contained in:
SzuWei Lin
2017-12-12 04:57:44 +00:00
committed by android-build-merger
parent d3d7c2e180 6553fd6cad
commit 90cb321f88
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
target/board/treble_common.mk
View File

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

9
target/product/treble_common.mk
View File

@@ -26,6 +26,10 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk)
# Split selinux policy # Split selinux policy
PRODUCT_FULL_TREBLE_OVERRIDE := true PRODUCT_FULL_TREBLE_OVERRIDE := true
# vintf utility:
PRODUCT_PACKAGES += \
vintf
# The Messaging app: # The Messaging app:
# Needed for android.telecom.cts.ExtendedInCallServiceTest#testOnCannedTextResponsesLoaded # Needed for android.telecom.cts.ExtendedInCallServiceTest#testOnCannedTextResponsesLoaded
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
@@ -63,6 +67,11 @@ PRODUCT_PACKAGES += \
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
netutils-wrapper-1.0 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): # Android Verified Boot (AVB):
# Builds a special vbmeta.img that disables AVB verification. # Builds a special vbmeta.img that disables AVB verification.
# Otherwise, AVB will prevent the device from booting the generic system.img. # Otherwise, AVB will prevent the device from booting the generic system.img.