From f786f03656c27b754b1fad128a58b946eb3c3102 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Fri, 8 Dec 2017 10:54:43 +0800 Subject: [PATCH 1/3] Add a default apn-conf.xml into GSI Add a default apn-conf.xml for telephony data network, then some devices, ex. emulator, could use the default setting when it's system image overrided by GSI. Bug: 69869274 Test: build pass and boot a Pixel device with GSI to home screen Change-Id: I0275a5d420eadcbb2f744e995c9a72a1fb46b935 --- target/product/treble_common.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk index 13b7769f8c..d406d323df 100644 --- a/target/product/treble_common.mk +++ b/target/product/treble_common.mk @@ -63,6 +63,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. From 5cde531adbf8ed5f6092b4c561d7fea466cbe89b Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Fri, 8 Dec 2017 11:06:30 +0800 Subject: [PATCH 2/3] Add vintf into GSI Bug: 70248004 Test: build pass and check the file in system image Change-Id: Id3a8dd20e3de5dbba9d6ec222b32fed8817d300b --- target/product/treble_common.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk index d406d323df..237718882b 100644 --- a/target/product/treble_common.mk +++ b/target/product/treble_common.mk @@ -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 += \ From 596c026fd6e66af803cd1dc0f490972efbc71106 Mon Sep 17 00:00:00 2001 From: SzuWei Lin Date: Thu, 16 Nov 2017 18:11:18 +0800 Subject: [PATCH 3/3] Enable VNDK runtime checking GSI enabled "BOARD_VNDK_VERSION := current" on O-MR1, but disabled VNDK runtime checking. This patch enables the checking Bug: 69393797 Test: Build pass and boot to home screen on a Pixel device with GSI Change-Id: I8f20db0798a07e63c453a9fe64638b99b41cd166 Merged-In: I8f20db0798a07e63c453a9fe64638b99b41cd166 (cherry picked from commit 7323f1d4ec912a91429d55b298742f748e0354ba) --- target/board/treble_common.mk | 1 - 1 file changed, 1 deletion(-) diff --git a/target/board/treble_common.mk b/target/board/treble_common.mk index 253d8ef8c4..44f601f1a2 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