diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-04 01:24:22 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-04 01:24:22 +0000 |
| commit | e111a22c86b4609993cc70cd41b11b8d02f53454 (patch) | |
| tree | 41d4a0b7de3ab7871a9f96feff8c5fd8aa42bd56 /system_wrappers/source/cpu_features_android.target.linux-arm.mk | |
| parent | 965e921cea1c7d32852b18fb65968bf71d5c9def (diff) | |
| download | webrtc-e111a22c86b4609993cc70cd41b11b8d02f53454.tar.gz | |
Update makefiles after merge of Chromium at 261622
This commit was generated by merge_from_chromium.py.
Change-Id: Ib42e3532b721e1ba8f5a8e00711f582337238590
Diffstat (limited to 'system_wrappers/source/cpu_features_android.target.linux-arm.mk')
| -rw-r--r-- | system_wrappers/source/cpu_features_android.target.linux-arm.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm.mk b/system_wrappers/source/cpu_features_android.target.linux-arm.mk index 254bf4dd..432aff17 100644 --- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk +++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk @@ -72,6 +72,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_MOJO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ @@ -172,6 +173,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_MOJO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ |