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

Commit 56e9a857 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[CrashRecovery] Add module to BCP and SSCP" into main am: d1aa0735 

Original change: https://android-review.googlesource.com/c/platform/build/+/2710238



Change-Id: I9adfb4b6a1497c462a19b76d09482bf5cee7fd5c
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb2f3fa4 d1aa0735

target/product/base_system.mk

+1 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,7 @@ PRODUCT_PACKAGES += \ 
    com.android.btservices \

    com.android.btservices \

    com.android.configinfrastructure \

    com.android.configinfrastructure \

    com.android.conscrypt \

    com.android.conscrypt \

    com.android.crashrecovery \

    com.android.devicelock \

    com.android.devicelock \

    com.android.extservices \

    com.android.extservices \

    com.android.healthfitness \

    com.android.healthfitness \

target/product/default_art_config.mk

+2 −0
Original line number Original line Diff line number Diff line
@@ -65,6 +65,7 @@ PRODUCT_APEX_BOOT_JARS := \ 
    com.android.btservices:framework-bluetooth \

    com.android.btservices:framework-bluetooth \

    com.android.configinfrastructure:framework-configinfrastructure \

    com.android.configinfrastructure:framework-configinfrastructure \

    com.android.conscrypt:conscrypt \

    com.android.conscrypt:conscrypt \

    com.android.crashrecovery:framework-crashrecovery \

    com.android.devicelock:framework-devicelock \

    com.android.devicelock:framework-devicelock \

    com.android.healthfitness:framework-healthfitness \

    com.android.healthfitness:framework-healthfitness \

    com.android.i18n:core-icu4j \

    com.android.i18n:core-icu4j \
@@ -93,6 +94,7 @@ PRODUCT_APEX_SYSTEM_SERVER_JARS := \ 
    com.android.appsearch:service-appsearch \

    com.android.appsearch:service-appsearch \

    com.android.art:service-art \

    com.android.art:service-art \

    com.android.configinfrastructure:service-configinfrastructure \

    com.android.configinfrastructure:service-configinfrastructure \

    com.android.crashrecovery:service-crashrecovery \

    com.android.healthfitness:service-healthfitness \

    com.android.healthfitness:service-healthfitness \

    com.android.media:service-media-s \

    com.android.media:service-media-s \

    com.android.ondevicepersonalization:service-ondevicepersonalization \

    com.android.ondevicepersonalization:service-ondevicepersonalization \