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

Commit 42c86611 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "[CrashRecovery] Add module lib to Android SDK" into main am: 4b2f12ca 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2754705



Change-Id: I7ca4a3ed84bfa8f49eb0fa5e65f7488da6c2d53f
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c71cfb94 4b2f12ca

api/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ combined_apis { 
        "framework-configinfrastructure",

        "framework-connectivity",

        "framework-connectivity-t",

        "framework-crashrecovery",

        "framework-devicelock",

        "framework-graphics",

        "framework-healthfitness",
@@ -104,6 +105,7 @@ combined_apis { 
    system_server_classpath: [

        "service-art",

        "service-configinfrastructure",

        "service-crashrecovery",

        "service-healthfitness",

        "service-media-s",

        "service-permission",

boot/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ custom_platform_bootclasspath { 
            apex: "com.android.conscrypt",

            module: "com.android.conscrypt-bootclasspath-fragment",

        },

        {

            apex: "com.android.crashrecovery",

            module: "com.android.crashrecovery-bootclasspath-fragment",

        },

        {

            apex: "com.android.devicelock",

            module: "com.android.devicelock-bootclasspath-fragment",