commit 6553fd6cad7579a738b85c20e0739b8eda594858
author Treehugger Robot <treehugger-gerrit@google.com> Tue Dec 12 04:50:26 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Dec 12 04:50:26 2017 +0000
tree cc7f738bcc562c48d901de4fb24265ef968be1d6
parent 966e080ade4dec945fa657dbf378eb38d9789ee8
parent 596c026fd6e66af803cd1dc0f490972efbc71106

Merge changes I8f20db07,Id3a8dd20,I0275a5d4

* changes:
  Enable VNDK runtime checking
  Add vintf into GSI
  Add a default apn-conf.xml into GSI

target/board/treble_common.mk

diff --git a/target/board/treble_common.mk b/target/board/treble_common.mk
index 253d8ef..44f601f 100644
--- a/target/board/treble_common.mk
+++ b/target/board/treble_common.mk
@@ -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

target/product/treble_common.mk

diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk
index 13b7769..2377188 100644
--- a/target/product/treble_common.mk
+++ b/target/product/treble_common.mk
@@ -26,6 +26,10 @@
 # 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 += \
     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.