Revert "Log to logd in the default identity service"
Revert "Add dependency on keymint cpp lib"
Revert "Allow default identity service to call keymint"
Revert submission 1956689-add rkp to identity-default
Reason for revert: Broke git-master. Will resubmit later.
Reverted Changes:
I96dcf3027:Add remote key provisioning to the IC HAL
Id686ac33a:Add dependency on keymint cpp lib
Ib368a2a00:Log to logd in the default identity service
I7d2906de0:Refactor IC support for RKP
Iae0f14f1c:Fix formatting of identity credential aidl
I01d086a4b:Allow default identity service to call keymint
Change-Id: I051e97b4b7ec8c060b46de42092c049f12379ea5
diff --git a/identity/aidl/default/service.cpp b/identity/aidl/default/service.cpp
index 1ff52f9..78f4fbc 100644
--- a/identity/aidl/default/service.cpp
+++ b/identity/aidl/default/service.cpp
@@ -26,25 +26,14 @@
using ::android::sp;
using ::android::base::InitLogging;
-using ::android::base::LogdLogger;
-using ::android::base::LogId;
-using ::android::base::LogSeverity;
using ::android::base::StderrLogger;
using ::aidl::android::hardware::identity::IdentityCredentialStore;
using ::android::hardware::identity::FakeSecureHardwareProxyFactory;
using ::android::hardware::identity::SecureHardwareProxyFactory;
-void ComboLogger(LogId id, LogSeverity severity, const char* tag, const char* file,
- unsigned int line, const char* message) {
- StderrLogger(id, severity, tag, file, line, message);
-
- static LogdLogger logdLogger;
- logdLogger(id, severity, tag, file, line, message);
-}
-
int main(int /*argc*/, char* argv[]) {
- InitLogging(argv, ComboLogger);
+ InitLogging(argv, StderrLogger);
sp<SecureHardwareProxyFactory> hwProxyFactory = new FakeSecureHardwareProxyFactory();