summaryrefslogtreecommitdiff
path: root/gpu/gpu_ipc.target.linux-arm64.mk
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2014-11-06 11:12:11 +0000
committerTorne (Richard Coles) <torne@google.com>2014-11-06 11:12:11 +0000
commit31cddfd4ec55fcfc2129f5fbb6b805caa05239e6 (patch)
tree1e6dd5fa7e5815f4eb3fdcfa62fe9e0b9cab5d62 /gpu/gpu_ipc.target.linux-arm64.mk
parentd89a76b554c21870a46be512d079b41cf4aa1a6c (diff)
downloadchromium_org-31cddfd4ec55fcfc2129f5fbb6b805caa05239e6.tar.gz
Merge from Chromium at DEPS revision db3f05efe0f9
This commit was generated by merge_to_master.py. Change-Id: Ia8ad0e588aab2864147fdf2270c1da6ed65a52f9
Diffstat (limited to 'gpu/gpu_ipc.target.linux-arm64.mk')
-rw-r--r--gpu/gpu_ipc.target.linux-arm64.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/gpu/gpu_ipc.target.linux-arm64.mk b/gpu/gpu_ipc.target.linux-arm64.mk
index 6d1fb7f043..486a1666bc 100644
--- a/gpu/gpu_ipc.target.linux-arm64.mk
+++ b/gpu/gpu_ipc.target.linux-arm64.mk
@@ -69,14 +69,17 @@ 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' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \
@@ -153,14 +156,17 @@ 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' \
+ '-DUSE_LIBPCI=1' \
'-DUSE_OPENSSL=1' \
'-DUSE_OPENSSL_CERTS=1' \
'-D__STDC_CONSTANT_MACROS' \