am 23b19382: am c9ea0294: Merge "Remove public from ScriptIntrinsicYuvToRGBThunker definition." into lmp-dev
* commit '23b19382accac2e35c3852bda13c6b9359ae2efa':
Remove public from ScriptIntrinsicYuvToRGBThunker definition.
diff --git a/v4/java/android/support/v4/os/ParcelableCompat.java b/v4/java/android/support/v4/os/ParcelableCompat.java
index 40ad994..fbb064f 100644
--- a/v4/java/android/support/v4/os/ParcelableCompat.java
+++ b/v4/java/android/support/v4/os/ParcelableCompat.java
@@ -34,7 +34,7 @@
public static <T> Parcelable.Creator<T> newCreator(
ParcelableCompatCreatorCallbacks<T> callbacks) {
if (android.os.Build.VERSION.SDK_INT >= 13) {
- ParcelableCompatCreatorHoneycombMR2Stub.instantiate(callbacks);
+ return ParcelableCompatCreatorHoneycombMR2Stub.instantiate(callbacks);
}
return new CompatCreator<T>(callbacks);
}
diff --git a/v8/renderscript/Android.mk b/v8/renderscript/Android.mk
index a288a86..c7e9268 100644
--- a/v8/renderscript/Android.mk
+++ b/v8/renderscript/Android.mk
@@ -21,6 +21,8 @@
include $(CLEAR_VARS)
+LOCAL_CFLAGS += -std=c++11
+
LOCAL_MODULE := android-support-v8-renderscript
LOCAL_SDK_VERSION := 18
LOCAL_SRC_FILES := $(call all-java-files-under, java/src)
diff --git a/v8/renderscript/rs_support/Android.mk b/v8/renderscript/rs_support/Android.mk
index df236ec..c43b767 100644
--- a/v8/renderscript/rs_support/Android.mk
+++ b/v8/renderscript/rs_support/Android.mk
@@ -1,7 +1,7 @@
LOCAL_PATH:=frameworks/rs
rs_base_CFLAGS := -Werror -Wall -Wno-unused-parameter -Wno-unused-variable \
- -Wno-overloaded-virtual -DRS_COMPATIBILITY_LIB
+ -Wno-overloaded-virtual -DRS_COMPATIBILITY_LIB -std=c++11
ifeq ($(ARCH_ARM_HAVE_NEON),true)
rs_base_CFLAGS += -DARCH_ARM_HAVE_NEON