commit | a8dbe3f21c692b274486d03e7e44b4d19a0ea06b | [log] [tgz] |
---|---|---|
author | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Tue Jun 17 18:50:35 2014 +0000 |
committer | Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> | Tue Jun 17 18:50:35 2014 +0000 |
tree | c9ba060c990277daa57e5f45f63382161947bc41 | |
parent | ea01fb660a036f391a2d42a2a6cd7d1bf223b56c [diff] [blame] | |
parent | 24ad0965404c0bc978f27db27e2f00ebac95239c [diff] [blame] |
Merge "Silence warnings about using offsetof on near-POD structs." into master-skia https://skia.googlesource.com/skia/+/24ad096 Change-Id: If7bd992905da096c98e415c3da88949ca4069d9d
diff --git a/dm/Android.mk b/dm/Android.mk index acbaaad..ed8a509 100644 --- a/dm/Android.mk +++ b/dm/Android.mk
@@ -12,6 +12,9 @@ -U_FORTIFY_SOURCE \ -D_FORTIFY_SOURCE=1 +LOCAL_CPPFLAGS := \ + -Wno-invalid-offsetof + LOCAL_SRC_FILES := \ DM.cpp \ DMBenchTask.cpp \