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

Commit 03e1892c authored Nov 15, 2023 by Treehugger Robot Committed by Automerger Merge Worker Nov 15, 2023

Merge "Revert "[CrashRecovery] Add module lib to Android SDK"" into main am:...

Merge "Revert "[CrashRecovery] Add module lib to Android SDK"" into main am: 3d70bb0a am: 9ab4d879

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

Change-Id: I0f52b7e2875d4e5d13c134f86becc28cf304fdf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 93d6d2ac 9ab4d879

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",
		@@ -106,7 +105,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",