From 1320f92c476a1ad9d19dba2a48c72b75566198e9 Mon Sep 17 00:00:00 2001 From: Primiano Tucci Date: Tue, 30 Sep 2014 14:45:55 +0100 Subject: Merge from Chromium at DEPS revision 267aeeb8d85c This commit was generated by merge_to_master.py. Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e --- jingle/jingle_glue.target.linux-arm.mk | 74 ++++++++-------------------------- 1 file changed, 17 insertions(+), 57 deletions(-) (limited to 'jingle/jingle_glue.target.linux-arm.mk') diff --git a/jingle/jingle_glue.target.linux-arm.mk b/jingle/jingle_glue.target.linux-arm.mk index 37f0b926ba..d9d0a595bd 100644 --- a/jingle/jingle_glue.target.linux-arm.mk +++ b/jingle/jingle_glue.target.linux-arm.mk @@ -5,7 +5,6 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := jingle_jingle_glue_gyp LOCAL_MODULE_SUFFIX := .a -LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) @@ -40,7 +39,6 @@ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ -Werror \ - -fno-exceptions \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -50,13 +48,13 @@ MY_CFLAGS_Debug := \ -fPIC \ -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-caller-saves \ + -Wno-psabi \ -fno-partial-inlining \ -fno-early-inlining \ -fno-tree-copy-prop \ -fno-tree-loop-optimize \ -fno-move-loop-invariants \ - -fno-caller-saves \ - -Wno-psabi \ -ffunction-sections \ -funwind-tables \ -g \ @@ -71,6 +69,7 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ @@ -94,11 +93,13 @@ MY_DEFS_Debug := \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ - '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="https://proxy-dev.googlezip.net:443/"' \ + '-DDATA_REDUCTION_DEV_FALLBACK_HOST="http://proxy-dev.googlezip.net:80/"' \ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DPOSIX_AVOID_MMAP' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -109,6 +110,7 @@ MY_DEFS_Debug := \ '-DANDROID' \ '-DPOSIX' \ '-DWEBRTC_POSIX' \ + '-DXML_STATIC' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -126,7 +128,6 @@ MY_DEFS_Debug := \ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ @@ -134,7 +135,7 @@ LOCAL_C_INCLUDES_Debug := \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ $(LOCAL_PATH)/third_party \ - $(PWD)/external/expat/lib \ + $(LOCAL_PATH)/third_party/expat/files/lib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -142,6 +143,7 @@ LOCAL_C_INCLUDES_Debug := \ # Flags passed to only C++ (and not C) files. LOCAL_CPPFLAGS_Debug := \ + -fno-exceptions \ -fno-rtti \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ @@ -159,7 +161,6 @@ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ -Werror \ - -fno-exceptions \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -169,13 +170,13 @@ MY_CFLAGS_Release := \ -fPIC \ -Wno-unused-local-typedefs \ -fno-tree-sra \ + -fno-caller-saves \ + -Wno-psabi \ -fno-partial-inlining \ -fno-early-inlining \ -fno-tree-copy-prop \ -fno-tree-loop-optimize \ -fno-move-loop-invariants \ - -fno-caller-saves \ - -Wno-psabi \ -ffunction-sections \ -funwind-tables \ -g \ @@ -213,11 +214,13 @@ MY_DEFS_Release := \ '-DENABLE_PRINTING=1' \ '-DENABLE_MANAGED_USERS=1' \ '-DDATA_REDUCTION_FALLBACK_HOST="http://compress.googlezip.net:80/"' \ - '-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \ + '-DDATA_REDUCTION_DEV_HOST="https://proxy-dev.googlezip.net:443/"' \ + '-DDATA_REDUCTION_DEV_FALLBACK_HOST="http://proxy-dev.googlezip.net:80/"' \ '-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \ '-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \ '-DVIDEO_HOLE=1' \ + '-DENABLE_LOAD_COMPLETION_HACKS=1' \ '-DPOSIX_AVOID_MMAP' \ '-DFEATURE_ENABLE_SSL' \ '-DFEATURE_ENABLE_VOICEMAIL' \ @@ -228,6 +231,7 @@ MY_DEFS_Release := \ '-DANDROID' \ '-DPOSIX' \ '-DWEBRTC_POSIX' \ + '-DXML_STATIC' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-D__STDC_CONSTANT_MACROS' \ @@ -246,7 +250,6 @@ MY_DEFS_Release := \ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target \ $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target \ - $(gyp_shared_intermediate_dir)/shim_headers/ashmem/target \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH) \ $(LOCAL_PATH)/third_party/webrtc/overrides \ @@ -254,7 +257,7 @@ LOCAL_C_INCLUDES_Release := \ $(LOCAL_PATH)/third_party/libjingle/source \ $(LOCAL_PATH)/testing/gtest/include \ $(LOCAL_PATH)/third_party \ - $(PWD)/external/expat/lib \ + $(LOCAL_PATH)/third_party/expat/files/lib \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -262,6 +265,7 @@ LOCAL_C_INCLUDES_Release := \ # Flags passed to only C++ (and not C) files. LOCAL_CPPFLAGS_Release := \ + -fno-exceptions \ -fno-rtti \ -fno-threadsafe-statics \ -fvisibility-inlines-hidden \ @@ -280,50 +284,6 @@ LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION)) LOCAL_ASFLAGS := $(LOCAL_CFLAGS) ### Rules for final target. -LOCAL_LDFLAGS_Debug := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -Wl,-z,relro \ - -Wl,-z,now \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--icf=safe \ - -Wl,--warn-shared-textrel \ - -Wl,-O1 \ - -Wl,--as-needed - - -LOCAL_LDFLAGS_Release := \ - -Wl,-z,now \ - -Wl,-z,relro \ - -Wl,--fatal-warnings \ - -Wl,-z,noexecstack \ - -fPIC \ - -Wl,-z,relro \ - -Wl,-z,now \ - -fuse-ld=gold \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -Wl,--icf=safe \ - -Wl,-O1 \ - -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel - - -LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) - -LOCAL_STATIC_LIBRARIES := - -# Enable grouping to fix circular references -LOCAL_GROUP_STATIC_LIBRARIES := true - LOCAL_SHARED_LIBRARIES := \ libstlport \ libdl -- cgit v1.2.3