diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-10 23:37:07 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-10 23:37:07 +0000 |
| commit | c9d3664bc736891d70e179d1fd79c5778179751e (patch) | |
| tree | 8811d7db699a3aaa179706928188bc90208d3521 /ft2.target.darwin-x86_64.mk | |
| parent | 79e79c858bd4641b2a516b5dfa0a4a23357e0d19 (diff) | |
| download | freetype-c9d3664bc736891d70e179d1fd79c5778179751e.tar.gz | |
Update makefiles after merge of Chromium at 276202
This commit was generated by merge_from_chromium.py.
Change-Id: I1cd22e1d6145cb6048baa4fefa1809f15d503fc9
Diffstat (limited to 'ft2.target.darwin-x86_64.mk')
| -rw-r--r-- | ft2.target.darwin-x86_64.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk index 8725fcc..ad70fa1 100644 --- a/ft2.target.darwin-x86_64.mk +++ b/ft2.target.darwin-x86_64.mk @@ -93,6 +93,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' \ @@ -192,6 +193,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' \ |