diff options
| author | Steven Moreland <smoreland@google.com> | 2017-07-20 03:05:02 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-07-20 03:05:02 +0000 |
| commit | 9f430b2782849090d2e5e3737304cd26724366fa (patch) | |
| tree | 80e2e9cbd26b7805380828737e9b0553fbafda23 /rs/jni/android_renderscript_RenderScript.cpp | |
| parent | fe4ec9e9465eb4859845aeea5f1dfbb70b4c9d00 (diff) | |
| parent | c840945a7809b1fd55621d107ce799d8af370744 (diff) | |
Merge "frameworks/base: use proper nativehelper headers" am: 826eafd958 am: 5c091dc944
am: c840945a78
Change-Id: I654e14f0d1b495450db81592a2e564e308746350
Diffstat (limited to 'rs/jni/android_renderscript_RenderScript.cpp')
| -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 ee48289731a8..f9f6bf7dbcab 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" |