Merge from Chromium at DEPS revision r213605
This commit was generated by merge_to_master.py.
Change-Id: I5ef9e03bf077dac295a7904f06b3cb6dec9fe213
diff --git a/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-x86.mk b/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-x86.mk
index 7154660..9fe67e9 100644
--- a/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-x86.mk
+++ b/webkit/renderer/compositor_bindings/webkit_compositor_bindings.target.linux-x86.mk
@@ -119,12 +119,12 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/third_party/skia/src/core \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/skia/include/config \
@@ -236,12 +236,12 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
+ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
$(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/khronos \
$(LOCAL_PATH)/gpu \
- $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \
- $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \
$(LOCAL_PATH)/third_party/skia/src/core \
$(LOCAL_PATH)/skia/config \
$(LOCAL_PATH)/third_party/skia/include/config \