From 889018d3d65e34623f458c7f27253e7a6ebd4642 Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Wed, 26 Sep 2018 16:23:02 +0100 Subject: [PATCH] Include AOSP telephony apps in mainline_system. These apps are included on all mainline devices. Including them necessitates splitting telephony.mk into two pieces, as "rild" installs on /vendor. Bug: 80410283 Test: lunch mainline_arm64; m nothing Change-Id: Id4f1684604c71e853c8096e9a6992e65b6dfefed --- target/product/full_base_telephony.mk | 3 ++- target/product/generic.mk | 3 ++- target/product/mainline_arm64.mk | 1 + target/product/mainline_system.mk | 4 ++-- .../{telephony.mk => telephony_system.mk} | 7 +++--- target/product/telephony_vendor.mk | 23 +++++++++++++++++++ target/product/treble_common.mk | 3 ++- 7 files changed, 35 insertions(+), 9 deletions(-) rename target/product/{telephony.mk => telephony_system.mk} (79%) create mode 100644 target/product/telephony_vendor.mk diff --git a/target/product/full_base_telephony.mk b/target/product/full_base_telephony.mk index af4097d87..ee590903e 100644 --- a/target/product/full_base_telephony.mk +++ b/target/product/full_base_telephony.mk @@ -28,4 +28,5 @@ PRODUCT_COPY_FILES := \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) diff --git a/target/product/generic.mk b/target/product/generic.mk index cc856f4f7..7a9732d09 100644 --- a/target/product/generic.mk +++ b/target/product/generic.mk @@ -18,7 +18,8 @@ # It includes the base Android platform. $(call inherit-product, $(SRC_TARGET_DIR)/product/generic_no_telephony.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) # Overrides PRODUCT_BRAND := generic diff --git a/target/product/mainline_arm64.mk b/target/product/mainline_arm64.mk index c83ce5f07..4e511e1e0 100644 --- a/target/product/mainline_arm64.mk +++ b/target/product/mainline_arm64.mk @@ -17,6 +17,7 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/mainline_system.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_vendor.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) PRODUCT_NAME := mainline_arm64 PRODUCT_DEVICE := generic_arm64 diff --git a/target/product/mainline_system.mk b/target/product/mainline_system.mk index 3581c4a5c..80efa4c31 100644 --- a/target/product/mainline_system.mk +++ b/target/product/mainline_system.mk @@ -14,9 +14,9 @@ # limitations under the License. # -# This makefile is the basis of a generic system image for a handheld -# device with no telephony. +# This makefile is the basis of a generic system image for a handheld device. $(call inherit-product, $(SRC_TARGET_DIR)/product/handheld_system.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk) # OTA support. PRODUCT_PACKAGES += \ diff --git a/target/product/telephony.mk b/target/product/telephony_system.mk similarity index 79% rename from target/product/telephony.mk rename to target/product/telephony_system.mk index 38a8caa8a..3175c8a67 100644 --- a/target/product/telephony.mk +++ b/target/product/telephony_system.mk @@ -1,5 +1,5 @@ # -# Copyright (C) 2007 The Android Open Source Project +# Copyright (C) 2018 The Android Open Source Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,8 +14,8 @@ # limitations under the License. # -# This is the list of product-level settings that are specific -# to products that have telephony hardware. +# This is the list of modules that are specific to products that have telephony +# hardware, and install on the system partition. PRODUCT_PACKAGES := \ CarrierConfig \ @@ -24,6 +24,5 @@ PRODUCT_PACKAGES := \ CallLogBackup \ CellBroadcastReceiver \ EmergencyInfo \ - rild PRODUCT_COPY_FILES := \ diff --git a/target/product/telephony_vendor.mk b/target/product/telephony_vendor.mk new file mode 100644 index 000000000..bddd3834e --- /dev/null +++ b/target/product/telephony_vendor.mk @@ -0,0 +1,23 @@ +# +# Copyright (C) 2018 The Android Open Source Project +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +# This is the list of modules that are specific to products that have telephony +# hardware, and install outside the system partition. + +PRODUCT_PACKAGES := \ + rild \ + +PRODUCT_COPY_FILES := \ diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk index 5c2a67857..d3cce7665 100644 --- a/target/product/treble_common.mk +++ b/target/product/treble_common.mk @@ -21,7 +21,8 @@ # Generic system image inherits from AOSP with telephony $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_system.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/telephony_vendor.mk) # Enable dynamic partition size PRODUCT_USE_DYNAMIC_PARTITION_SIZE := true