From e111a22c86b4609993cc70cd41b11b8d02f53454 Mon Sep 17 00:00:00 2001 From: Android Chromium Automerger Date: Fri, 4 Apr 2014 01:24:22 +0000 Subject: Update makefiles after merge of Chromium at 261622 This commit was generated by merge_from_chromium.py. Change-Id: Ib42e3532b721e1ba8f5a8e00711f582337238590 --- system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk | 2 ++ 1 file changed, 2 insertions(+) (limited to 'system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk') diff --git a/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk b/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk index 84f58627..80bc48c8 100644 --- a/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk +++ b/system_wrappers/source/cpu_features_android.target.darwin-x86_64.mk @@ -73,6 +73,7 @@ MY_DEFS_Debug := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_MOJO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ @@ -170,6 +171,7 @@ MY_DEFS_Release := \ '-DDISABLE_NACL' \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ + '-DUSE_MOJO=1' \ '-DENABLE_WEBRTC=1' \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_CONFIGURATION_POLICY' \ -- cgit v1.2.3