aboutsummaryrefslogtreecommitdiff
path: root/ots.target.linux-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-03-12 09:46:44 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-03-12 09:46:44 +0000
commitd0abcc6eadd951abaae478dc14c2a8ba771cd94c (patch)
treed7ae925ca6306824dab3aefca1ed3d579b5e4c57 /ots.target.linux-x86.mk
parented7b18f2686dcef7bf1ac3da7698f5c8c95f9121 (diff)
downloadots-d0abcc6eadd951abaae478dc14c2a8ba771cd94c.tar.gz
Update makefiles after merge of Chromium at 256489
This commit was generated by merge_from_chromium.py. Change-Id: If4701df3874080de6ce4d3c12808b29fe6cad7c3
Diffstat (limited to 'ots.target.linux-x86.mk')
-rw-r--r--ots.target.linux-x86.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index 2769289..baf4f32 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -106,11 +106,11 @@ MY_DEFS_Debug := \
'-DENABLE_NEW_GAMEPAD_API=1' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DUSE_OPENSSL=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \
@@ -193,11 +193,11 @@ MY_DEFS_Release := \
'-DENABLE_NEW_GAMEPAD_API=1' \
'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
- '-DUSE_OPENSSL=1' \
'-DENABLE_EGLIMAGE=1' \
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DUSE_OPENSSL=1' \
'-D__STDC_CONSTANT_MACROS' \
'-D__STDC_FORMAT_MACROS' \
'-DANDROID' \