diff options
author | Primiano Tucci <primiano@google.com> | 2014-09-30 14:45:55 +0100 |
---|---|---|
committer | Primiano Tucci <primiano@google.com> | 2014-09-30 14:45:55 +0100 |
commit | 1320f92c476a1ad9d19dba2a48c72b75566198e9 (patch) | |
tree | ea7f149ccad687b22c18a72b729646568b2d54fb /gin/gin.target.linux-mips.mk | |
parent | 39b78c562f50ad7d5551ee861121f899239525a2 (diff) | |
download | chromium_org-1320f92c476a1ad9d19dba2a48c72b75566198e9.tar.gz |
Merge from Chromium at DEPS revision 267aeeb8d85c
This commit was generated by merge_to_master.py.
Change-Id: Id3aac9713b301fae64408cdaee0888724eeb7c0e
Diffstat (limited to 'gin/gin.target.linux-mips.mk')
-rw-r--r-- | gin/gin.target.linux-mips.mk | 62 |
1 files changed, 11 insertions, 51 deletions
diff --git a/gin/gin.target.linux-mips.mk b/gin/gin.target.linux-mips.mk index f08e69e75f..d6911a3c25 100644 --- a/gin/gin.target.linux-mips.mk +++ b/gin/gin.target.linux-mips.mk @@ -5,7 +5,6 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := gin_gin_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)) @@ -29,6 +28,7 @@ LOCAL_SRC_FILES := \ gin/array_buffer.cc \ gin/context_holder.cc \ gin/converter.cc \ + gin/debug_impl.cc \ gin/dictionary.cc \ gin/function_template.cc \ gin/interceptor.cc \ @@ -42,6 +42,7 @@ LOCAL_SRC_FILES := \ gin/per_context_data.cc \ gin/per_isolate_data.cc \ gin/runner.cc \ + gin/run_microtasks_observer.cc \ gin/shell_runner.cc \ gin/try_catch.cc \ gin/v8_platform.cc \ @@ -54,7 +55,6 @@ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ \ - -fno-exceptions \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -63,8 +63,6 @@ MY_CFLAGS_Debug := \ -pipe \ -fPIC \ -Wno-unused-local-typedefs \ - -EL \ - -mhard-float \ -ffunction-sections \ -funwind-tables \ -g \ @@ -79,6 +77,7 @@ MY_CFLAGS_Debug := \ -Wno-unused-but-set-variable \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ @@ -102,11 +101,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' \ '-DGIN_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -126,7 +127,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)/v8/include \ @@ -137,6 +137,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 \ @@ -154,7 +155,6 @@ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ \ - -fno-exceptions \ -fno-strict-aliasing \ -Wall \ -Wno-unused-parameter \ @@ -163,8 +163,6 @@ MY_CFLAGS_Release := \ -pipe \ -fPIC \ -Wno-unused-local-typedefs \ - -EL \ - -mhard-float \ -ffunction-sections \ -funwind-tables \ -g \ @@ -202,11 +200,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' \ '-DGIN_IMPLEMENTATION' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ @@ -227,7 +227,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)/v8/include \ @@ -238,6 +237,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 \ @@ -256,46 +256,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 \ - -EL \ - -Wl,--no-keep-memory \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -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 \ - -EL \ - -Wl,--no-keep-memory \ - -nostdlib \ - -Wl,--no-undefined \ - -Wl,--exclude-libs=ALL \ - -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 |