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

Commit 2f69bc46 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Add telephony-common, ims-common to telephony apex." am: 52df8f51 am:... 

Merge "Add telephony-common, ims-common to telephony apex." am: 52df8f51 am: 5d2a05f5 am: b5144d4c

Change-Id: Iadb4874a5a812fb214506325d797354ad99818af
parents d6e05fe1 b5144d4c

target/product/base_system.mk

+3 −3
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ PRODUCT_PACKAGES += \ 
    idmap2 \

    idmap2d \

    ime \

    ims-common \

    incident \

    incidentd \

    incident_helper \
@@ -260,7 +259,6 @@ PRODUCT_PACKAGES += \ 
    task_profiles.json \

    tc \

    telecom \

    telephony-common \

    tombstoned \

    traced \

    traced_probes \
@@ -339,7 +337,9 @@ PRODUCT_UPDATABLE_BOOT_JARS := \ 
    com.android.conscrypt:conscrypt \

    com.android.ipsec:ike \

    com.android.media:updatable-media \

    com.android.sdkext:framework-sdkext

    com.android.sdkext:framework-sdkext \

    com.android.telephony:telephony-common \

    com.android.telephony:ims-common



PRODUCT_COPY_FILES += \

    system/core/rootdir/init.usb.rc:system/etc/init/hw/init.usb.rc \