commit 846179069a8f46b6fc8ba239c29bdbfd6053c651
author Stephen Hines <srhines@google.com> Wed Aug 13 17:43:15 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 13 17:43:15 2014 +0000
tree 146ef26b409cb95280dd4d64fc2a1839d5b57726
parent 7734980a4517e4242543d829859fcbf206adfda2
parent 4504fe849745d7a7a373ebc363534eb81f254f66

am 4504fe84: am 7b0c952a: Merge "Revert "Added C++11 flag to RS support.""

* commit '4504fe849745d7a7a373ebc363534eb81f254f66':
  Revert "Added C++11 flag to RS support."

v8/renderscript/Android.mk

diff --git a/v8/renderscript/Android.mk b/v8/renderscript/Android.mk
index 3d1dfdf..d8f3ce5 100644
--- a/v8/renderscript/Android.mk
+++ b/v8/renderscript/Android.mk
@@ -21,8 +21,6 @@
 
 include $(CLEAR_VARS)
 
-LOCAL_CFLAGS += -std=c++11
-
 LOCAL_MODULE := android-support-v8-renderscript
 #LOCAL_SDK_VERSION := 17
 LOCAL_SRC_FILES := $(call all-java-files-under, java/src)

v8/renderscript/rs_support/Android.mk

diff --git a/v8/renderscript/rs_support/Android.mk b/v8/renderscript/rs_support/Android.mk
index c43b767..df236ec 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 -std=c++11
+		  -Wno-overloaded-virtual -DRS_COMPATIBILITY_LIB
 
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
 rs_base_CFLAGS += -DARCH_ARM_HAVE_NEON