summaryrefslogtreecommitdiff
path: root/rs
diff options
context:
space:
mode:
authorSteven Moreland <smoreland@google.com>2017-07-20 02:50:53 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-07-20 02:50:53 +0000
commit5c091dc9449b583e18656a8850a61f557dfcc945 (patch)
treedb4ca724dd661b112d2bd72da67f2a91edce0850 /rs
parent5f047a68d96f252772144a729f423c172ce816e4 (diff)
parent826eafd95885adbfc142f3f70ec82b4091abed85 (diff)
Merge "frameworks/base: use proper nativehelper headers"
am: 826eafd958 Change-Id: I36f10ff4d963284a313f1cc5b368f82549a4adb2
Diffstat (limited to 'rs')
-rw-r--r--rs/jni/android_renderscript_RenderScript.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/rs/jni/android_renderscript_RenderScript.cpp b/rs/jni/android_renderscript_RenderScript.cpp
index c059973ed437..5070e39129ab 100644
--- a/rs/jni/android_renderscript_RenderScript.cpp
+++ b/rs/jni/android_renderscript_RenderScript.cpp
@@ -30,7 +30,7 @@
#include <android-base/macros.h>
#include "jni.h"
-#include "JNIHelp.h"
+#include <nativehelper/JNIHelp.h>
#include "android_runtime/AndroidRuntime.h"
#include "android_runtime/android_view_Surface.h"
#include "android_runtime/android_util_AssetManager.h"