diff options
| author | Steven Moreland <smoreland@google.com> | 2017-07-20 02:58:46 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-20 02:58:46 +0000 |
| commit | c840945a7809b1fd55621d107ce799d8af370744 (patch) | |
| tree | 55a8a8690fbe3de3497e95c7773b0422541ec470 /rs | |
| parent | 12286b2608f69c3911c40f4dc2a070097373b73f (diff) | |
| parent | 5c091dc9449b583e18656a8850a61f557dfcc945 (diff) | |
Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958
am: 5c091dc944
Change-Id: I582cc33d13d04950ca066074c292141605f3ca27
Diffstat (limited to 'rs')
| -rw-r--r-- | rs/jni/android_renderscript_RenderScript.cpp | 2 |
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" |