Update makefiles after merge of Chromium at 277428
This commit was generated by merge_from_chromium.py.
Change-Id: I35c59b36614d836accbb543178393a6c061586f1
diff --git a/common_video/common_video.target.linux-arm.mk b/common_video/common_video.target.linux-arm.mk
index bc5feb2..e4fcd4f 100644
--- a/common_video/common_video.target.linux-arm.mk
+++ b/common_video/common_video.target.linux-arm.mk
@@ -126,6 +126,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \
@@ -247,6 +248,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/webrtc/overrides \
$(LOCAL_PATH)/third_party \