commit aae1b35aebcc205691b2a5abcc5ce0fe270f478a
author Torne (Richard Coles) <torne@google.com> Mon Nov 12 14:58:24 2012 +0000
committer Torne (Richard Coles) <torne@google.com> Mon Nov 12 14:58:24 2012 +0000
tree be0d5d1ad11ce857649b2196ae2d6cae911259d1
parent 64134c04710fa3646c2abc96a2eadd28104cec27

Update makefiles after merge of Chromium at r167172

This commit was generated by merge_from_chromium.py.

Change-Id: If54a8ac061b6dec04a59543e54ee205c07d77b1c

ots.target.mk

diff --git a/ots.target.mk b/ots.target.mk
index db0e2f5..7212d87 100644
--- a/ots.target.mk
+++ b/ots.target.mk
@@ -101,10 +101,12 @@
 	'-DCHROMIUM_BUILD' \
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_PEPPER_THREADING' \
 	'-DENABLE_GPU=1' \
 	'-DUSE_OPENSSL=1' \
 	'-DENABLE_EGLIMAGE=1' \
 	'-DUSE_SKIA=1' \
+	'-D__STDC_CONSTANT_MACROS' \
 	'-D__STDC_FORMAT_MACROS' \
 	'-DANDROID' \
 	'-D__GNU_SOURCE=1' \