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

Commit ed0743da authored by Harshit Mahajan's avatar Harshit Mahajan
Browse files

Revert "[CrashRecovery] Add module lib to Android SDK" 

Revert submission 2789412-cherrypicker-L65800000963076834:N61100001405784943

Reason for revert: Leading to merge conflict
Bug: b/311082270

Reverted changes: /q/submissionid:2789412-cherrypicker-L65800000963076834:N61100001405784943

Change-Id: Ic80afd7a8e09cf2e0cf6e453cbe004db0c9fcbd7
Merged-In: I5c65d85d50b214926f5473908694070b4e896201
parent 9c3742af

api/Android.bp

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

        "framework-connectivity",

        "framework-connectivity-t",

        "framework-crashrecovery",

        "framework-devicelock",

        "framework-graphics",

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

        "service-art",

        "service-configinfrastructure",

        "service-crashrecovery",

        "service-healthfitness",

        "service-media-s",

        "service-permission",

boot/Android.bp

+0 −4
Original line number Diff line number Diff line
@@ -83,10 +83,6 @@ 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",