diff options
| author | Mark Salyzyn <salyzyn@google.com> | 2016-09-28 10:07:20 -0700 |
|---|---|---|
| committer | Mark Salyzyn <salyzyn@google.com> | 2016-09-30 12:47:05 -0700 |
| commit | 66ce3e08c5632a20ea66bde6dd76397041edf034 (patch) | |
| tree | e77589e0f6c62e8ac1c8faabe2d9dd2934d3ecee /trusty/gatekeeper | |
| parent | 0dd4431072cce3c62876b728cb20aa5b77b11a8d (diff) | |
| download | core-66ce3e08c5632a20ea66bde6dd76397041edf034.tar.gz core-66ce3e08c5632a20ea66bde6dd76397041edf034.tar.bz2 core-66ce3e08c5632a20ea66bde6dd76397041edf034.zip | |
system/core Replace cutils/log.h with android/log.h
Should use android/log.h instead of cutils/log.h as a good example
to all others. Adjust header order to comply with Android Coding
standards.
Test: Compile
Bug: 26552300
Bug: 31289077
Change-Id: I2c9cbbbd64d8dccf2d44356361d9742e4a9b9031
Diffstat (limited to 'trusty/gatekeeper')
| -rw-r--r-- | trusty/gatekeeper/trusty_gatekeeper.cpp | 9 | ||||
| -rw-r--r-- | trusty/gatekeeper/trusty_gatekeeper_ipc.c | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/trusty/gatekeeper/trusty_gatekeeper.cpp b/trusty/gatekeeper/trusty_gatekeeper.cpp index d24f44f2e..7e55fb1eb 100644 --- a/trusty/gatekeeper/trusty_gatekeeper.cpp +++ b/trusty/gatekeeper/trusty_gatekeeper.cpp @@ -14,18 +14,19 @@ * limitations under the License. */ +#define LOG_TAG "TrustyGateKeeper" + +#include <assert.h> #include <errno.h> #include <stdio.h> -#include <assert.h> #include <type_traits> +#include <android/log.h> + #include "trusty_gatekeeper.h" #include "trusty_gatekeeper_ipc.h" #include "gatekeeper_ipc.h" -#define LOG_TAG "TrustyGateKeeper" -#include <cutils/log.h> - namespace gatekeeper { const uint32_t SEND_BUF_SIZE = 8192; diff --git a/trusty/gatekeeper/trusty_gatekeeper_ipc.c b/trusty/gatekeeper/trusty_gatekeeper_ipc.c index a1c319e5a..ae536c539 100644 --- a/trusty/gatekeeper/trusty_gatekeeper_ipc.c +++ b/trusty/gatekeeper/trusty_gatekeeper_ipc.c @@ -14,12 +14,13 @@ * limitations under the License. */ +#define LOG_TAG "TrustyGateKeeper" + #include <errno.h> #include <stdlib.h> #include <string.h> -#define LOG_TAG "TrustyGateKeeper" -#include <cutils/log.h> +#include <android/log.h> #include <trusty/tipc.h> #include "trusty_gatekeeper_ipc.h" |