diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-09-12 12:10:22 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-09-12 12:10:22 +0100 |
| commit | 58537e28ecd584eab876aee8be7156509866d23a (patch) | |
| tree | 8988984e52090aaadf33cff139d7dd212cd13656 /media/video_capture_android_jni_headers.target.darwin-arm.mk | |
| parent | 0a1b11dee8e5cb2520121c300858fea6138e3c54 (diff) | |
| download | chromium_org-58537e28ecd584eab876aee8be7156509866d23a.tar.gz | |
Merge from Chromium at DEPS revision 222756
This commit was generated by merge_to_master.py.
Change-Id: I40d7f32f195f328f005f230ea80d07092d48040e
Diffstat (limited to 'media/video_capture_android_jni_headers.target.darwin-arm.mk')
| -rw-r--r-- | media/video_capture_android_jni_headers.target.darwin-arm.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/video_capture_android_jni_headers.target.darwin-arm.mk b/media/video_capture_android_jni_headers.target.darwin-arm.mk index 643c5ec372..b4d7d604e5 100644 --- a/media/video_capture_android_jni_headers.target.darwin-arm.mk +++ b/media/video_capture_android_jni_headers.target.darwin-arm.mk @@ -78,6 +78,7 @@ MY_CFLAGS_Debug := \ MY_DEFS_Debug := \ '-DANGLE_DX11' \ + '-DWTF_VECTOR_INITIAL_SIZE=16' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ @@ -90,6 +91,7 @@ MY_DEFS_Debug := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ @@ -156,6 +158,7 @@ MY_CFLAGS_Release := \ MY_DEFS_Release := \ '-DANGLE_DX11' \ + '-DWTF_VECTOR_INITIAL_SIZE=16' \ '-D_FILE_OFFSET_BITS=64' \ '-DNO_TCMALLOC' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ @@ -168,6 +171,7 @@ MY_DEFS_Release := \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ + '-DCLD_VERSION=1' \ '-D__STDC_CONSTANT_MACROS' \ '-D__STDC_FORMAT_MACROS' \ '-DANDROID' \ |