Merge from Chromium at DEPS revision 269467
This commit was generated by merge_to_master.py.
Change-Id: Id6c03d44b5ad8b098017a943eb9ec8d804dfed99
diff --git a/content/content_browser.target.linux-arm.mk b/content/content_browser.target.linux-arm.mk
index f1155a9..d293c03 100644
--- a/content/content_browser.target.linux-arm.mk
+++ b/content/content_browser.target.linux-arm.mk
@@ -100,6 +100,7 @@
content/browser/android/browser_jni_registrar.cc \
content/browser/android/browser_startup_controller.cc \
content/browser/android/child_process_launcher_android.cc \
+ content/browser/android/content_readback_handler.cc \
content/browser/android/content_settings.cc \
content/browser/android/content_startup_flags.cc \
content/browser/android/content_video_view.cc \
@@ -566,6 +567,7 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DMOJO_USE_SYSTEM_IMPL' \
'-DPOSIX_AVOID_MMAP' \
'-DSK_ENABLE_INST_COUNT=0' \
@@ -737,6 +739,7 @@
'-DCLD_VERSION=1' \
'-DENABLE_PRINTING=1' \
'-DENABLE_MANAGED_USERS=1' \
+ '-DVIDEO_HOLE=1' \
'-DMOJO_USE_SYSTEM_IMPL' \
'-DPOSIX_AVOID_MMAP' \
'-DSK_ENABLE_INST_COUNT=0' \