Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2e87fba authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Merge "Include AOSP telephony apps in mainline_system." am: fb59f554 am: f6326846 

am: 3d4d7573

Change-Id: Ie65735567063f7404fbbf6a75dbd1163f37dd4ce
parents 1a6a4400 3d4d7573

target/product/full_base_telephony.mk

+2 −1
Original line number Diff line number Diff line
@@ -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)

target/product/generic.mk

+2 −1
Original line number Diff line number Diff line
@@ -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

target/product/mainline_arm64.mk

+1 −0
Original line number Diff line number Diff line
@@ -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

target/product/mainline_system.mk

+2 −2
Original line number Diff line number Diff line
@@ -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 += \

target/product/telephony.mk→target/product/telephony_system.mk

+3 −4
Original line number Diff line number Diff line 
#

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