diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-30 15:19:42 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-30 15:19:42 +0100 |
| commit | 558790d6acca3451cf3a6b497803a5f07d0bec58 (patch) | |
| tree | fcc36c3da74559ee6015cb5e9f596105cdc9f56e /media/player_android.target.linux-arm.mk | |
| parent | 8643c35ec8e6546ae6e04c51e08c4d57d40e88da (diff) | |
| download | chromium_org-558790d6acca3451cf3a6b497803a5f07d0bec58.tar.gz | |
Merge from Chromium at DEPS revision r214332
This commit was generated by merge_to_master.py.
Change-Id: I82a7c38de906244dc882493568013be659aa65d1
Diffstat (limited to 'media/player_android.target.linux-arm.mk')
| -rw-r--r-- | media/player_android.target.linux-arm.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/player_android.target.linux-arm.mk b/media/player_android.target.linux-arm.mk index 5e38ce72a9..3874555912 100644 --- a/media/player_android.target.linux-arm.mk +++ b/media/player_android.target.linux-arm.mk @@ -84,6 +84,7 @@ MY_DEFS_Debug := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DMEDIA_IMPLEMENTATION' \ + '-DMESA_EGL_NO_X11_HEADERS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -173,6 +174,7 @@ MY_DEFS_Release := \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ '-DMEDIA_IMPLEMENTATION' \ + '-DMESA_EGL_NO_X11_HEADERS' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ |