summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mark Salyzyn <salyzyn@google.com> 2016-10-07 15:20:36 +0000
committer android-build-merger <android-build-merger@google.com> 2016-10-07 15:20:36 +0000
commitab9b60efd6565635cc1abe0ed7980f065e84667c (patch)
treef9e572cdcf387fa19ba88b26ced24b85bd597ea6
parent03389b70dfd802190247784154b3c00abd4862bb (diff)
parent82df72dc1f1370fbc5ca3cf937a5204df6f101df (diff)
Merge "jni: move security interfaces to private" am: 07bc1ee77d
am: 82df72dc1f Change-Id: I63c71141a74cdfe55080492353f1bb2cc4e5e696
-rw-r--r--core/jni/android_app_admin_SecurityLog.cpp2
-rw-r--r--core/jni/android_util_EventLog.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android_app_admin_SecurityLog.cpp b/core/jni/android_app_admin_SecurityLog.cpp
index da47c4c0fbb9..e8ca79384f68 100644
--- a/core/jni/android_app_admin_SecurityLog.cpp
+++ b/core/jni/android_app_admin_SecurityLog.cpp
@@ -19,7 +19,7 @@
#include "JNIHelp.h"
#include "core_jni_helpers.h"
#include "jni.h"
-#include "log/logger.h"
+#include <private/android_logger.h>
// The size of the tag number comes out of the payload size.
#define MAX_EVENT_PAYLOAD (LOGGER_ENTRY_MAX_PAYLOAD - sizeof(int32_t))
diff --git a/core/jni/android_util_EventLog.cpp b/core/jni/android_util_EventLog.cpp
index 4f8a2cb91506..173afd8c0f05 100644
--- a/core/jni/android_util_EventLog.cpp
+++ b/core/jni/android_util_EventLog.cpp
@@ -19,7 +19,7 @@
#include "JNIHelp.h"
#include "core_jni_helpers.h"
#include "jni.h"
-#include "log/logger.h"
+#include <log/logger.h>
#define UNUSED __attribute__((__unused__))