diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:52:04 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-06-20 14:52:04 +0100 |
| commit | f8ee788a64d60abd8f2d742a5fdedde054ecd910 (patch) | |
| tree | 7dc14380200b953c64e0ccd16435cdbd1dbf1205 /media/media_android_imageformat_list.target.darwin-x86.mk | |
| parent | fcbbbe23a38088a52492922075e71a419c4b01ec (diff) | |
| download | chromium_org-f8ee788a64d60abd8f2d742a5fdedde054ecd910.tar.gz | |
Merge from Chromium at DEPS revision 278205
This commit was generated by merge_to_master.py.
Change-Id: I23f1e7ea8c154ba72e7fb594436216f861f868ab
Diffstat (limited to 'media/media_android_imageformat_list.target.darwin-x86.mk')
| -rw-r--r-- | media/media_android_imageformat_list.target.darwin-x86.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/media/media_android_imageformat_list.target.darwin-x86.mk b/media/media_android_imageformat_list.target.darwin-x86.mk index 13d4a6f9d6..cd97333391 100644 --- a/media/media_android_imageformat_list.target.darwin-x86.mk +++ b/media/media_android_imageformat_list.target.darwin-x86.mk @@ -86,6 +86,7 @@ MY_DEFS_Debug := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -114,6 +115,7 @@ MY_DEFS_Debug := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Debug := \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -175,6 +177,7 @@ MY_DEFS_Release := \ '-DUSE_LIBJPEG_TURBO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ + '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ @@ -204,6 +207,7 @@ MY_DEFS_Release := \ # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES_Release := \ + $(gyp_shared_intermediate_dir) \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport |