commit ac3c655923c58e907a3aac6eed1ad05433464a4b
author Android Chromium Automerger <chromium-automerger@android> Tue Jun 10 23:37:07 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Tue Jun 10 23:37:07 2014 +0000
tree c0250c9f2869266156080e8c5f066fec6a2739d3
parent 4375dd2e97b320a57699fdcf7e71dec8b7dfedbb

Update makefiles after merge of Chromium at 276202

This commit was generated by merge_from_chromium.py.

Change-Id: I01b7a6591151bcf47449e32a23614f3174c1d518

src/preprocessor.target.linux-arm.mk

diff --git a/src/preprocessor.target.linux-arm.mk b/src/preprocessor.target.linux-arm.mk
index 0f77079..578c5d4 100644
--- a/src/preprocessor.target.linux-arm.mk
+++ b/src/preprocessor.target.linux-arm.mk
@@ -91,6 +91,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' \
@@ -190,6 +191,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' \