commit 1f5f390d0bfbada791a3bbb7010ad4370cb0d0ad
author Android Chromium Automerger <chromium-automerger@android> Tue Jun 10 23:37:12 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Tue Jun 10 23:37:12 2014 +0000
tree 8fbe11dedeaa387f5a3a1280e4099e2286662479
parent 5d8c7e619cd64ea3e1ca47ce23db665e2731504e

Update makefiles after merge of Chromium at 276202

This commit was generated by merge_from_chromium.py.

Change-Id: I8870bd93ab78bbd3046681b5f494800ae94c9ab4

ots.target.linux-x86_64.mk

diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk
index e5f8ee5..d3f3e55 100644
--- a/ots.target.linux-x86_64.mk
+++ b/ots.target.linux-x86_64.mk
@@ -102,6 +102,7 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DENABLE_WEBRTC=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_BROWSER_CDMS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
@@ -193,6 +194,7 @@
 	'-DUSE_LIBJPEG_TURBO=1' \
 	'-DENABLE_WEBRTC=1' \
 	'-DUSE_PROPRIETARY_CODECS' \
+	'-DENABLE_BROWSER_CDMS' \
 	'-DENABLE_CONFIGURATION_POLICY' \
 	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
 	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \