summaryrefslogtreecommitdiff
path: root/video_engine/video_engine_core.target.linux-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-05-17 16:07:17 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-05-17 16:07:17 +0000
commit0af662dfc0f6302c7a89b3ad141079347328a460 (patch)
tree604654eec93193bda554edb37ae7920c3acfa485 /video_engine/video_engine_core.target.linux-x86.mk
parent618be31e3c68ebe00416437f2a816297a1b0fb98 (diff)
downloadwebrtc-0af662dfc0f6302c7a89b3ad141079347328a460.tar.gz
Update makefiles after merge of Chromium at 271215
This commit was generated by merge_from_chromium.py. Change-Id: I9f544c8ba5553156a8413c2512153949af8ffa52
Diffstat (limited to 'video_engine/video_engine_core.target.linux-x86.mk')
-rw-r--r--video_engine/video_engine_core.target.linux-x86.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/video_engine/video_engine_core.target.linux-x86.mk b/video_engine/video_engine_core.target.linux-x86.mk
index 567b8a7d..dedd1314 100644
--- a/video_engine/video_engine_core.target.linux-x86.mk
+++ b/video_engine/video_engine_core.target.linux-x86.mk
@@ -68,6 +68,7 @@ MY_CFLAGS_Debug := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-fno-builtin-cos \
-fno-builtin-sin \
-fno-builtin-cosf \
@@ -174,6 +175,7 @@ MY_CFLAGS_Release := \
-fvisibility=hidden \
-pipe \
-fPIC \
+ -Wno-unused-local-typedefs \
-fno-builtin-cos \
-fno-builtin-sin \
-fno-builtin-cosf \