commit cb4fdd1fdaaf2c11d40d3aeb3d5f62127230a6cc
author Android Chromium Automerger <chromium-automerger@android> Mon Jun 16 14:50:41 2014 +0000
committer Android Chromium Automerger <chromium-automerger@android> Mon Jun 16 14:50:41 2014 +0000
tree 3abed7548a0a9be7856a740dbee91dfa411dc17c
parent c7fcada57f3f930a6efb5d57ff2931e8d9c12041

Update makefiles after merge of Chromium at 277428

This commit was generated by merge_from_chromium.py.

Change-Id: I35c59b36614d836accbb543178393a6c061586f1

modules/audio_conference_mixer.target.darwin-arm.mk

diff --git a/modules/audio_conference_mixer.target.darwin-arm.mk b/modules/audio_conference_mixer.target.darwin-arm.mk
index adeaace..1c81635 100644
--- a/modules/audio_conference_mixer.target.darwin-arm.mk
+++ b/modules/audio_conference_mixer.target.darwin-arm.mk
@@ -129,6 +129,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 \
@@ -251,6 +252,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 \