| commit | d9d0aab2f9767dd56658e2cf05d5e385755eba7f | [log] [tgz] |
|---|---|---|
| author | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Thu Feb 05 17:26:11 2015 +0000 |
| committer | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Thu Feb 05 17:26:11 2015 +0000 |
| tree | e87206e606ff039f0514b8def24f9c290d370c4a | |
| parent | 97e48fbcf6bafc561759eca8c852efa0a3e1efcb [diff] [blame] | |
| parent | f3cdce79103558c4136cc6e8b04d50a0b0f04eb4 [diff] [blame] |
Merge "Build in C++11 mode on Unix-like bots." into master-skia https://skia.googlesource.com/skia/+/f3cdce79103558c4136cc6e8b04d50a0b0f04eb4 Change-Id: Icc07e6027f0a3a750de7bdbb82fe6f7451827b9f
diff --git a/dm/Android.mk b/dm/Android.mk index 6c828f7..338f334 100644 --- a/dm/Android.mk +++ b/dm/Android.mk
@@ -9,13 +9,13 @@ include $(CLEAR_VARS) LOCAL_CFLAGS += \ -fPIC \ - -Wno-c++11-extensions \ -Wno-unused-parameter \ -U_FORTIFY_SOURCE \ -D_FORTIFY_SOURCE=1 \ -DSKIA_IMPLEMENTATION=1 LOCAL_CPPFLAGS := \ + -std=c++11 \ -Wno-invalid-offsetof LOCAL_SRC_FILES := \