Merge "Depend on KeyMint HAL via default" (93f4b0af) · Commits · e / os / android_system_core

gatekeeperd/Android.bp

+3 −2

Original line number	Diff line number	Diff line
		@@ -29,7 +29,9 @@ cc_binary {
		srcs: [
		"gatekeeperd.cpp",
		],

		defaults: [
		"keymint_use_latest_hal_aidl_ndk_shared",
		],
		shared_libs: [
		"libbinder",
		"libbinder_ndk",
		@@ -43,7 +45,6 @@ cc_binary {
		"libhidlbase",
		"android.hardware.gatekeeper@1.0",
		"libgatekeeper_aidl",
		"android.hardware.security.keymint-V1-ndk",
		"android.security.authorization-ndk",
		],

+3 −1

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