From 06241051e84b5f90e52d84a81b52b6889f35a6fb Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 10 Mar 2017 21:29:47 +0900 Subject: [PATCH] Make telephony work on generic system image Bug: 36070427 Test: modem is up and emergency call can be made Change-Id: Ic09200943a7ae7c51e420c6485f3b1b95c702265 --- core/Makefile | 4 ++++ target/board/generic_arm64_ab/BoardConfig.mk | 4 ++++ target/product/aosp_arm64_ab.mk | 6 ++++++ 3 files changed, 14 insertions(+) diff --git a/core/Makefile b/core/Makefile index 9dedae3c8..4af423c87 100644 --- a/core/Makefile +++ b/core/Makefile @@ -896,6 +896,10 @@ INTERNAL_USERIMAGES_DEPS += $(SELINUX_FC) INTERNAL_USERIMAGES_DEPS += $(BLK_ALLOC_TO_BASE_FS) +INTERNAL_USERIMAGES_DEPS += \ + $(ALL_MODULES.fs_config_dirs.INSTALLED) \ + $(ALL_MODULES.fs_config_files.INSTALLED) \ + # $(1): the path of the output dictionary file # $(2): additional "key=value" pairs to append to the dictionary file. define generate-userimage-prop-dictionary diff --git a/target/board/generic_arm64_ab/BoardConfig.mk b/target/board/generic_arm64_ab/BoardConfig.mk index 14de55f7b..13f28209c 100644 --- a/target/board/generic_arm64_ab/BoardConfig.mk +++ b/target/board/generic_arm64_ab/BoardConfig.mk @@ -73,6 +73,10 @@ TARGET_NO_RECOVERY := true BOARD_USES_RECOVERY_AS_BOOT := true BOARD_BUILD_SYSTEM_ROOT_IMAGE := true +# TODO(jiyong) These might be SoC specific. +BOARD_ROOT_EXTRA_FOLDERS := bt_firmware firmware firmware/radio persist +BOARD_ROOT_EXTRA_SYMLINKS := /vendor/lib/dsp:/dsp + # TODO(b/35603549): this is currently set to 2.5GB to support sailfish/marlin # Fix this! BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648 diff --git a/target/product/aosp_arm64_ab.mk b/target/product/aosp_arm64_ab.mk index 080cc46ff..cde1ae5af 100644 --- a/target/product/aosp_arm64_ab.mk +++ b/target/product/aosp_arm64_ab.mk @@ -115,6 +115,12 @@ PRODUCT_PACKAGES += \ wificond \ wifilogd \ +# TODO(jiyong) move ims to vendor partition +#PRODUCT_PACKAGES += ims + +# TODO(jiyong) remove this!!! +PRODUCT_DEFAULT_DEV_CERTIFICATE := vendor/google/certs/devkeys/devkey + PRODUCT_SYSTEM_VERITY_PARTITION := /dev/block/bootdevice/by-name/system AB_OTA_UPDATER := true