diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-06-16 14:50:41 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-06-16 14:50:41 +0000 |
| commit | cb4fdd1fdaaf2c11d40d3aeb3d5f62127230a6cc (patch) | |
| tree | 3abed7548a0a9be7856a740dbee91dfa411dc17c /webrtc.target.linux-x86.mk | |
| parent | c7fcada57f3f930a6efb5d57ff2931e8d9c12041 (diff) | |
| download | webrtc-cb4fdd1fdaaf2c11d40d3aeb3d5f62127230a6cc.tar.gz | |
Update makefiles after merge of Chromium at 277428
This commit was generated by merge_from_chromium.py.
Change-Id: I35c59b36614d836accbb543178393a6c061586f1
Diffstat (limited to 'webrtc.target.linux-x86.mk')
| -rw-r--r-- | webrtc.target.linux-x86.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/webrtc.target.linux-x86.mk b/webrtc.target.linux-x86.mk index bc8b91f7..44e6a452 100644 --- a/webrtc.target.linux-x86.mk +++ b/webrtc.target.linux-x86.mk @@ -120,6 +120,7 @@ MY_DEFS_Debug := \ # 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 \ @@ -226,6 +227,7 @@ MY_DEFS_Release := \ # 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 \ |