diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-05-09 18:35:53 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-05-13 13:57:14 +0100 |
| commit | c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d (patch) | |
| tree | 1dbdbb0624cc869ab25ee7f46971984c6fee3e7a /media/shared_memory_support.target.linux-x86.mk | |
| parent | 2d519ce2457219605d4f472da8d2ffd469796035 (diff) | |
| download | chromium_org-c2e0dbddbe15c98d52c4786dac06cb8952a8ae6d.tar.gz | |
Merge from Chromium at DEPS revision r198571
This commit was generated by merge_to_master.py.
Change-Id: I951118a03836157090561764dd2627f0add8118f
Diffstat (limited to 'media/shared_memory_support.target.linux-x86.mk')
| -rw-r--r-- | media/shared_memory_support.target.linux-x86.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/media/shared_memory_support.target.linux-x86.mk b/media/shared_memory_support.target.linux-x86.mk index 7651a5694c..b9a3ab73f4 100644 --- a/media/shared_memory_support.target.linux-x86.mk +++ b/media/shared_memory_support.target.linux-x86.mk @@ -26,7 +26,8 @@ LOCAL_SRC_FILES := \ media/audio/audio_parameters.cc \ media/audio/shared_memory_util.cc \ media/base/audio_bus.cc \ - media/base/channel_layout.cc + media/base/channel_layout.cc \ + media/base/vector_math.cc # Flags passed to both C and C++ files. @@ -46,6 +47,7 @@ MY_CFLAGS := \ -march=pentium4 \ -msse2 \ -mfpmath=sse \ + -fuse-ld=gold \ -ffunction-sections \ -funwind-tables \ -g \ @@ -66,7 +68,6 @@ MY_CFLAGS := \ MY_CFLAGS_C := MY_DEFS := \ - '-DUSE_SKIA' \ '-D_FILE_OFFSET_BITS=64' \ '-DUSE_LINUX_BREAKPAD' \ '-DNO_TCMALLOC' \ @@ -74,7 +75,6 @@ MY_DEFS := \ '-DCHROMIUM_BUILD' \ '-DUSE_LIBJPEG_TURBO=1' \ '-DUSE_PROPRIETARY_CODECS' \ - '-DENABLE_PEPPER_THREADING' \ '-DENABLE_GPU=1' \ '-DUSE_OPENSSL=1' \ '-DENABLE_EGLIMAGE=1' \ @@ -95,8 +95,8 @@ LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS) # Include paths placed before CFLAGS/CPPFLAGS LOCAL_C_INCLUDES := \ - $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(LOCAL_PATH) \ + $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(GYP_ABS_ANDROID_TOP_DIR)/frameworks/wilhelm/include \ $(GYP_ABS_ANDROID_TOP_DIR)/bionic \ $(GYP_ABS_ANDROID_TOP_DIR)/external/stlport/stlport @@ -121,12 +121,13 @@ LOCAL_LDFLAGS := \ -Wl,-z,noexecstack \ -fPIC \ -m32 \ + -fuse-ld=gold \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ + -Wl,--gc-sections \ -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections + -Wl,--as-needed LOCAL_STATIC_LIBRARIES := |