| author | Tellen Yu <tellen.yu@amlogic.com> | 2017-11-01 03:07:15 (GMT) |
|---|---|---|
| committer | Gerrit Code Review <gituser@scgit.amlogic.com> | 2017-11-01 03:07:15 (GMT) |
| commit | ebba2b10e0b69b7c31d1d1feb9bd2e7672d9cd30 (patch) | |
| tree | 4528cc477cf35a2167c177fce1728297a8b2f752 | |
| parent | e0a01e57438e26b1872e9a8d87223d2fea7a014e (diff) | |
| parent | 52004ced3413ebf1a926757a7f64f0269503d068 (diff) | |
| download | gatekeeper-ref-o-20171115.zip gatekeeper-ref-o-20171115.tar.gz gatekeeper-ref-o-20171115.tar.bz2 | |
Merge "treble: enable full treble mode [5/9]" into o-amlogic
| -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; |