Merge "Fix possibly uninitialized access to strideIn, and turn on -Werror."
am: d142ace
* commit 'd142ace887b48b9ebcbd41fbda5714fc4336178a':
Fix possibly uninitialized access to strideIn, and turn on -Werror.
diff --git a/v8/renderscript/jni/Android.mk b/v8/renderscript/jni/Android.mk
index 45538b0..2d382b1 100644
--- a/v8/renderscript/jni/Android.mk
+++ b/v8/renderscript/jni/Android.mk
@@ -14,7 +14,7 @@
frameworks/rs/cpp \
frameworks/rs/driver
-LOCAL_CFLAGS += -Wno-unused-parameter -U_FORTIFY_SOURCE
+LOCAL_CFLAGS += -Wno-unused-parameter -U_FORTIFY_SOURCE -Werror
LOCAL_CFLAGS += -DRS_COMPATIBILITY_LIB -std=c++11
LOCAL_MODULE:= libRSSupportIO
@@ -44,7 +44,7 @@
frameworks/rs \
frameworks/rs/cpp
-LOCAL_CFLAGS += -Wno-unused-parameter -U_FORTIFY_SOURCE -std=c++11
+LOCAL_CFLAGS += -Wno-unused-parameter -U_FORTIFY_SOURCE -Werror -std=c++11
LOCAL_MODULE:= librsjni
LOCAL_MODULE_TAGS := optional
diff --git a/v8/renderscript/jni/android_renderscript_RenderScript.cpp b/v8/renderscript/jni/android_renderscript_RenderScript.cpp
index ed8d5ee..f8c178c 100644
--- a/v8/renderscript/jni/android_renderscript_RenderScript.cpp
+++ b/v8/renderscript/jni/android_renderscript_RenderScript.cpp
@@ -2297,7 +2297,7 @@
nAllocationGetStride(JNIEnv *_env, jobject _this, jlong con, jlong alloc)
{
LOG_API("nAllocationGetStride, con(%p), alloc(%p)", (RsContext)con, (RsAllocation)alloc);
- size_t strideIn;
+ size_t strideIn = 0;
void* ptr = NULL;
if (alloc != 0 && dispatchTab.AllocationGetPointer != nullptr) {
ptr = dispatchTab.AllocationGetPointer((RsContext)con, (RsAllocation)alloc, 0,