diff options
| author | Primiano Tucci <primiano@google.com> | 2014-09-30 14:46:34 +0100 |
|---|---|---|
| committer | Primiano Tucci <primiano@google.com> | 2014-09-30 14:46:34 +0100 |
| commit | 99b065411ef372e5b466655b83edaf569fed891d (patch) | |
| tree | c71b607fb580635c2fd3eb6e5b969ab0dcdceb67 /gen_asm_offsets_vp8.target.linux-arm64.mk | |
| parent | 1cd6bfcf0a5429df9df17134be2e356f8ff7595a (diff) | |
| parent | f28f50af6177a1cfed0074c7e52125b647c7c5d8 (diff) | |
| download | libvpx-99b065411ef372e5b466655b83edaf569fed891d.tar.gz | |
Merge from Chromium at DEPS revision 267aeeb8d85c
This commit was generated by merge_to_master.py.
Change-Id: Ibe3eceb872795061abe4aff95f63e8b2a81df2c4
Diffstat (limited to 'gen_asm_offsets_vp8.target.linux-arm64.mk')
| -rw-r--r-- | gen_asm_offsets_vp8.target.linux-arm64.mk | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/gen_asm_offsets_vp8.target.linux-arm64.mk b/gen_asm_offsets_vp8.target.linux-arm64.mk index 4aa7df6..e9713f3 100644 --- a/gen_asm_offsets_vp8.target.linux-arm64.mk +++ b/gen_asm_offsets_vp8.target.linux-arm64.mk @@ -6,7 +6,6 @@ LOCAL_MODULE_CLASS := GYP LOCAL_MODULE := third_party_libvpx_gen_asm_offsets_vp8_gyp LOCAL_MODULE_STEM := gen_asm_offsets_vp8 LOCAL_MODULE_SUFFIX := .stamp -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)) @@ -59,7 +58,6 @@ LOCAL_SRC_FILES := # Flags passed to both C and C++ files. MY_CFLAGS_Debug := \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -85,6 +83,7 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -107,11 +106,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -134,6 +135,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 \ @@ -149,7 +151,6 @@ LOCAL_CPPFLAGS_Debug := \ # Flags passed to both C and C++ files. MY_CFLAGS_Release := \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -197,11 +198,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' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -224,6 +227,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 \ |