commit c67d22ac6db73aaa9540294c86344bf8021495b3
author Treehugger Robot <treehugger-gerrit@google.com> Wed Aug 24 05:04:32 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Aug 24 05:04:32 2016 +0000
tree 2e461d412273b5eefb913561f987be0004c34d6a
parent 9f98286cf29d226b05b10ef96f18d9938392fa67
parent dac87e97af207741d450016161b62d085254901c

Merge "ART: Remove -std=gnu++11"

build/Android.common_build.mk

diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk
index c8e3654..b5d41d9 100644
--- a/build/Android.common_build.mk
+++ b/build/Android.common_build.mk
@@ -136,7 +136,6 @@
 # Base set of cflags used by all things ART.
 art_cflags += \
   -fno-rtti \
-  -std=gnu++11 \
   -ggdb3 \
   -Wall \
   -Werror \

dalvikvm/Android.mk

diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk
index 71e9a28..6c0bcb1 100644
--- a/dalvikvm/Android.mk
+++ b/dalvikvm/Android.mk
@@ -18,7 +18,7 @@
 
 include art/build/Android.common.mk
 
-dalvikvm_cflags := -Wall -Werror -Wextra -std=gnu++11
+dalvikvm_cflags := -Wall -Werror -Wextra
 
 include $(CLEAR_VARS)
 LOCAL_MODULE := dalvikvm