author | Tellen Yu <tellen.yu@amlogic.com> | 2017-09-26 10:17:37 (GMT) |
---|---|---|
committer | Tellen Yu <tellen.yu@amlogic.com> | 2017-09-27 06:47:08 (GMT) |
commit | 52004ced3413ebf1a926757a7f64f0269503d068 (patch) | |
tree | 0058864496cce40918c093e91fd507c9268700ab | |
parent | 125f7bb3eef36d9d9c96f8048e70f84c4a764d21 (diff) | |
download | gatekeeper-52004ced3413ebf1a926757a7f64f0269503d068.zip gatekeeper-52004ced3413ebf1a926757a7f64f0269503d068.tar.gz gatekeeper-52004ced3413ebf1a926757a7f64f0269503d068.tar.bz2 |
treble: enable full treble mode [5/9]
PD# 151674
in full treble mode, gatekeeper use software instead of trusty,
can not use libtrusty.so
Change-Id: I788f9c9362fb9c8a56c4f0726f21e9fc39ff41ef
-rw-r--r-- | Android.mk | 6 | ||||
-rw-r--r-- | GKPModule.cpp | 10 |
2 files changed, 8 insertions, 8 deletions
@@ -30,10 +30,11 @@ LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_SRC_FILES := \ GKPModule.cpp \ - trusty/trusty_gatekeeper_ipc.c \ - trusty/trusty_gatekeeper.cpp \ soft/SoftGateKeeperDevice.cpp +# trusty/trusty_gatekeeper_ipc.c \ +# trusty/trusty_gatekeeper.cpp \ + LOCAL_STATIC_LIBRARIES := libscrypt_static LOCAL_C_INCLUDES := \ external/boringssl/src/include/ \ @@ -46,7 +47,6 @@ LOCAL_SHARED_LIBRARIES := \ libgatekeeper \ liblog \ libcutils \ - libtrusty \ libcrypto LOCAL_MODULE_TAGS := optional diff --git a/GKPModule.cpp b/GKPModule.cpp index 15ed4d8..6bcb60d 100644 --- a/GKPModule.cpp +++ b/GKPModule.cpp @@ -20,10 +20,10 @@ #include <errno.h> #include <stdlib.h> -#include "trusty/trusty_gatekeeper.h" +//#include "trusty/trusty_gatekeeper.h" #include "soft/SoftGateKeeperDevice.h" -using gatekeeper::TrustyGateKeeperDevice; +//using gatekeeper::TrustyGateKeeperDevice; using android::SoftGateKeeperDevice; static int gatekeeper_open(const hw_module_t *module, const char *name, @@ -40,9 +40,9 @@ static int gatekeeper_open(const hw_module_t *module, const char *name, *device = gatekeeper->sw_device(); } else { - TrustyGateKeeperDevice *gatekeeper = new TrustyGateKeeperDevice(module); - if (gatekeeper == NULL) return -ENOMEM; - *device = gatekeeper->hw_device(); + //TrustyGateKeeperDevice *gatekeeper = new TrustyGateKeeperDevice(module); + //if (gatekeeper == NULL) return -ENOMEM; + //*device = gatekeeper->hw_device(); } return 0; |