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

Commit 3bf74ea9 authored Oct 01, 2024 by Automerger Merge Worker Committed by Gerrit Code Review Oct 01, 2024

Merge "Merge "Revert "Sync with new drm common aidl interface"" into...

Merge "Merge "Revert "Sync with new drm common aidl interface"" into android15-tests-dev am: 4b93de7e" into main

parents 30ce127f 45c5ad3b

drm/libmediadrmrkp/Android.bp

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,6 @@ cc_library {
	],		],
	static_libs: [		static_libs: [
	"android.hardware.common-V2-ndk",		"android.hardware.common-V2-ndk",
	"android.hardware.drm.common-V1-ndk",
	"android.hardware.drm-V1-ndk",		"android.hardware.drm-V1-ndk",
	"android.hardware.security.rkp-V3-ndk",		"android.hardware.security.rkp-V3-ndk",
	"libbase",		"libbase",
	@@ -40,7 +39,6 @@ cc_binary {
	],		],
	static_libs: [		static_libs: [
	"android.hardware.common-V2-ndk",		"android.hardware.common-V2-ndk",
	"android.hardware.drm.common-V1-ndk",
	"android.hardware.drm-V1-ndk",		"android.hardware.drm-V1-ndk",
	"android.hardware.security.rkp-V3-ndk",		"android.hardware.security.rkp-V3-ndk",
	"libbase",		"libbase",

drm/mediadrm/plugins/clearkey/aidl/Android.bp

+0 −1

Original line number	Original line	Diff line number	Diff line
	@@ -40,7 +40,6 @@ cc_defaults {

	static_libs: [		static_libs: [
	"android.hardware.common-V2-ndk",		"android.hardware.common-V2-ndk",
	"android.hardware.drm.common-V1-ndk",
	"android.hardware.drm-V1-ndk",		"android.hardware.drm-V1-ndk",
	"libbase",		"libbase",
	"libclearkeybase",		"libclearkeybase",