commit dbfa6f176cf1231315829678beadfe1ec7028d4c
author Android Chromium Automerger <chromium-automerger@android> Mon Jun 16 14:50:40 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Mon Jun 16 14:50:40 2014 +0000
tree 21060e61f18b9a00b65c8bf4509d3cf11199e6ce
parent 1f5f390d0bfbada791a3bbb7010ad4370cb0d0ad

Update makefiles after merge of Chromium at 277428

This commit was generated by merge_from_chromium.py.

Change-Id: I9fc6dd2196dab1c98683554d2cb7c97e4aa35260

ots.target.linux-x86_64.mk

diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk
index d3f3e55..30d1ac9 100644
--- a/ots.target.linux-x86_64.mk
+++ b/ots.target.linux-x86_64.mk
@@ -131,6 +131,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 \
@@ -224,6 +225,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 \