summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Steven Moreland <smoreland@google.com> 2017-07-29 20:06:25 +0000
committer android-build-merger <android-build-merger@google.com> 2017-07-29 20:06:25 +0000
commitd0ea5528fe6bd6ff3cfb00a72fc98a11cac2e598 (patch)
tree6a75a18d51c7ef4273f201b096015da06201f825
parenta2ca184e3018c01b51a44d74a098504681ef743c (diff)
parent124acec8adffd30060dc4b50881ade068ed0fc2a (diff)
Merge "SurfaceTexture.cpp: use proper nativehelper headers" into oc-dev-plus-aosp
am: 124acec8ad Change-Id: I1b9f55ed3661a440b89a7820bf4d1b9c66f240af
-rw-r--r--core/jni/android/graphics/SurfaceTexture.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/jni/android/graphics/SurfaceTexture.cpp b/core/jni/android/graphics/SurfaceTexture.cpp
index 9242b70a7e9a..d098a355085e 100644
--- a/core/jni/android/graphics/SurfaceTexture.cpp
+++ b/core/jni/android/graphics/SurfaceTexture.cpp
@@ -34,8 +34,8 @@
#include <utils/misc.h>
#include "jni.h"
-#include "JNIHelp.h"
-#include "ScopedLocalRef.h"
+#include <nativehelper/JNIHelp.h>
+#include <nativehelper/ScopedLocalRef.h>
// ----------------------------------------------------------------------------