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

Commit 5ff26282 authored Dec 07, 2021 by David Drysdale Committed by Automerger Merge Worker Dec 07, 2021

Merge "Depend on KeyMint HAL via default" am: 93f4b0af am: 8a5a7039 am: 10ffee94

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1904171

Change-Id: Ib9a6b2766740e8bd98d1848820307125642ffd63

parents 648f4d08 10ffee94

gatekeeperd/Android.bp

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,9 @@ cc_binary {
	srcs: [		srcs: [
	"gatekeeperd.cpp",		"gatekeeperd.cpp",
	],		],
			defaults: [
			"keymint_use_latest_hal_aidl_ndk_shared",
			],
	shared_libs: [		shared_libs: [
	"libbinder",		"libbinder",
	"libbinder_ndk",		"libbinder_ndk",
	@@ -43,7 +45,6 @@ cc_binary {
	"libhidlbase",		"libhidlbase",
	"android.hardware.gatekeeper@1.0",		"android.hardware.gatekeeper@1.0",
	"libgatekeeper_aidl",		"libgatekeeper_aidl",
	"android.hardware.security.keymint-V1-ndk",
	"android.security.authorization-ndk",		"android.security.authorization-ndk",
	],		],

trusty/keymaster/Android.bp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -105,8 +105,10 @@ cc_binary {
	"keymint/TrustySharedSecret.cpp",		"keymint/TrustySharedSecret.cpp",
	"keymint/service.cpp",		"keymint/service.cpp",
	],		],
			defaults: [
			"keymint_use_latest_hal_aidl_ndk_shared",
			],
	shared_libs: [		shared_libs: [
	"android.hardware.security.keymint-V1-ndk",
	"android.hardware.security.secureclock-V1-ndk",		"android.hardware.security.secureclock-V1-ndk",
	"android.hardware.security.sharedsecret-V1-ndk",		"android.hardware.security.sharedsecret-V1-ndk",
	"lib_android_keymaster_keymint_utils",		"lib_android_keymaster_keymint_utils",