diff options
| author | 2016-08-24 05:04:32 +0000 | |
|---|---|---|
| committer | 2016-08-24 05:04:32 +0000 | |
| commit | c67d22ac6db73aaa9540294c86344bf8021495b3 (patch) | |
| tree | 2e461d412273b5eefb913561f987be0004c34d6a | |
| parent | 9f98286cf29d226b05b10ef96f18d9938392fa67 (diff) | |
| parent | dac87e97af207741d450016161b62d085254901c (diff) | |
Merge "ART: Remove -std=gnu++11"
| -rw-r--r-- | build/Android.common_build.mk | 1 | ||||
| -rw-r--r-- | dalvikvm/Android.mk | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/build/Android.common_build.mk b/build/Android.common_build.mk index c8e3654633..b5d41d98ae 100644 --- a/build/Android.common_build.mk +++ b/build/Android.common_build.mk @@ -136,7 +136,6 @@ endif # Base set of cflags used by all things ART. art_cflags += \ -fno-rtti \ - -std=gnu++11 \ -ggdb3 \ -Wall \ -Werror \ diff --git a/dalvikvm/Android.mk b/dalvikvm/Android.mk index 71e9a283d6..6c0bcb173e 100644 --- a/dalvikvm/Android.mk +++ b/dalvikvm/Android.mk @@ -18,7 +18,7 @@ LOCAL_PATH := $(call my-dir) 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 |