diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-11-06 11:12:36 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-11-06 11:12:36 +0000 |
| commit | 585a8c4239bad0147e6b1310d8e2cdcc5024d6d9 (patch) | |
| tree | 8c1ee2f722f5f5e7cc32ea674e8194fcd45f80fa /ft2.target.darwin-arm.mk | |
| parent | 352c29c8f81785a03bac31940ce7c27bdcc068a0 (diff) | |
| parent | c33092207688bc4ec067bf039561036cbcc171d8 (diff) | |
| download | freetype-ub-webview-m40-release.tar.gz | |
Merge from Chromium at DEPS revision db3f05efe0f9webview-m40_r4webview-m40_r3webview-m40_r2webview-m40_r1ub-webview-m40-release
This commit was generated by merge_to_master.py.
Change-Id: Ia3d0f40b6945e5c9f5063a1b329881a2a4de2bb2
Diffstat (limited to 'ft2.target.darwin-arm.mk')
| -rw-r--r-- | ft2.target.darwin-arm.mk | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index f8147fa..31c6db1 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -100,11 +100,13 @@ MY_DEFS_Debug := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -113,6 +115,7 @@ MY_DEFS_Debug := \ '-DCHROME_PNG_WRITE_SUPPORT' \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -204,11 +207,13 @@ MY_DEFS_Release := \ '-DUSE_PROPRIETARY_CODECS' \ '-DENABLE_BROWSER_CDMS' \ '-DENABLE_CONFIGURATION_POLICY' \ + '-DENABLE_NOTIFICATIONS' \ '-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \ '-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \ - '-DENABLE_EGLIMAGE=1' \ + '-DDONT_EMBED_BUILD_METADATA' \ '-DCLD_VERSION=1' \ '-DENABLE_PRINTING=1' \ + '-DENABLE_BASIC_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DVIDEO_HOLE=1' \ '-DENABLE_LOAD_COMPLETION_HACKS=1' \ @@ -217,6 +222,7 @@ MY_DEFS_Release := \ '-DCHROME_PNG_WRITE_SUPPORT' \ '-DPNG_USER_CONFIG' \ '-DCHROME_PNG_READ_PACK_SUPPORT' \ + '-DUSE_LIBPCI=1' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ |