Commit f418e1e7 authored Oct 04, 2017 by TreeHugger Robot Committed by Android (Google) Code Review Oct 04, 2017

Merge changes from topics "switch_to_km_ng", "need_km_interface_fix"

* changes:
  Switch to new NG AndroidKeymaster3Device
  Fix wrong origin assumption for wrapped KM0 hals
  Reflect: Removed KeymasterEnforcement dependencies on openssl
  Software keymaster attestations return 3 as keymaster version
  Relax finish result on RSA operations

parents 34c72216 5a07ed48

keymaster/3.0/default/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,8 @@ LOCAL_SHARED_LIBRARIES := \
		libcrypto \
		libkeymaster_portable \
		libkeymaster_staging \
		libpuresoftkeymasterdevice \
		libkeymaster3device \
		libhidlbase \
		libhidltransport \
		libutils \