Update makefiles after merge of Chromium at 277428
This commit was generated by merge_from_chromium.py.
Change-Id: I9fc6dd2196dab1c98683554d2cb7c97e4aa35260
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index b1231d5..79ff91b 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -137,6 +137,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Debug := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \
@@ -237,6 +238,7 @@
# Include paths placed before CFLAGS/CPPFLAGS
LOCAL_C_INCLUDES_Release := \
+ $(gyp_shared_intermediate_dir) \
$(LOCAL_PATH) \
$(LOCAL_PATH)/third_party/ots/include \
$(LOCAL_PATH)/third_party/zlib \