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

Include AOSP telephony apps in mainline_system.

Browse Source 
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
This commit is contained in:
Anton Hansson
2018-09-26 16:23:02 +01:00
parent 1b66873130
commit 889018d3d6
7 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
target/product/full_base_telephony.mk
View File

@@ -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)

3
target/product/generic.mk
View File

@@ -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

1
target/product/mainline_arm64.mk
View File

@@ -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

4
target/product/mainline_system.mk
View File

@@ -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 += \

7
target/product/telephony.mk → target/product/telephony_system.mk
View File

@@ -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 := \

23
target/product/telephony_vendor.mk Normal file
View File

@@ -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 := \

3
target/product/treble_common.mk
View File

@@ -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