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 | 7c877e3223fb8f7a77cb6d82b3bea77455e94fe4 (patch) | |
tree | 46b9870b5570ccedcd3d1b8d17e996135b4ab200 | |
parent | 60438e43bd5efd3299ac233745b38d2eb000db86 (diff) | |
parent | 3e24c89c8009a8ad0bc4f71d4c2ee8cbe45af939 (diff) | |
download | libyuv-7c877e3223fb8f7a77cb6d82b3bea77455e94fe4.tar.gz |
Merge from Chromium at DEPS revision 267aeeb8d85c
This commit was generated by merge_to_master.py.
Change-Id: I01211393e835beaa5dc48a084cebd6bac994d48c
-rw-r--r-- | libyuv.target.darwin-arm.mk | 75 | ||||
-rw-r--r-- | libyuv.target.darwin-arm64.mk | 59 | ||||
-rw-r--r-- | libyuv.target.darwin-mips.mk | 67 | ||||
-rw-r--r-- | libyuv.target.darwin-x86.mk | 63 | ||||
-rw-r--r-- | libyuv.target.darwin-x86_64.mk | 63 | ||||
-rw-r--r-- | libyuv.target.linux-arm.mk | 75 | ||||
-rw-r--r-- | libyuv.target.linux-arm64.mk | 59 | ||||
-rw-r--r-- | libyuv.target.linux-mips.mk | 67 | ||||
-rw-r--r-- | libyuv.target.linux-x86.mk | 63 | ||||
-rw-r--r-- | libyuv.target.linux-x86_64.mk | 63 | ||||
-rw-r--r-- | libyuv_neon.target.darwin-arm.mk | 66 | ||||
-rw-r--r-- | libyuv_neon.target.linux-arm.mk | 66 |
12 files changed, 154 insertions, 632 deletions
diff --git a/libyuv.target.darwin-arm.mk b/libyuv.target.darwin-arm.mk index a488665..c04afd0 100644 --- a/libyuv.target.darwin-arm.mk +++ b/libyuv.target.darwin-arm.mk @@ -5,14 +5,12 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libyuv_libyuv_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)) # Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp,,,$(GYP_VAR_PREFIX))/libjpeg.stamp +GYP_TARGET_DEPENDENCIES := GYP_GENERATED_OUTPUTS := @@ -62,7 +60,6 @@ LOCAL_SRC_FILES := \ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -72,13 +69,13 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -Wno-format \ -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 \ @@ -97,6 +94,7 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ @@ -120,14 +118,15 @@ 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' \ '-DHAVE_JPEG' \ '-DLIBYUV_NEON' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -145,7 +144,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -153,6 +152,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 \ @@ -170,7 +170,6 @@ LOCAL_CPPFLAGS_Debug := \ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -180,13 +179,13 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -Wno-format \ -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 \ @@ -228,14 +227,15 @@ 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' \ '-DHAVE_JPEG' \ '-DLIBYUV_NEON' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -253,7 +253,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -261,6 +261,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 +281,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 diff --git a/libyuv.target.darwin-arm64.mk b/libyuv.target.darwin-arm64.mk index 468a7b0..8e7a656 100644 --- a/libyuv.target.darwin-arm64.mk +++ b/libyuv.target.darwin-arm64.mk @@ -5,14 +5,12 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libyuv_libyuv_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)) # Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp,,,$(GYP_VAR_PREFIX))/libjpeg.stamp +GYP_TARGET_DEPENDENCIES := GYP_GENERATED_OUTPUTS := @@ -61,7 +59,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 \ @@ -87,6 +84,7 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -109,13 +107,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -133,7 +132,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -141,6 +140,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 \ @@ -156,7 +156,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 \ @@ -204,13 +203,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -228,7 +228,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -236,6 +236,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 \ @@ -254,42 +255,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 \ - -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 \ - -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 diff --git a/libyuv.target.darwin-mips.mk b/libyuv.target.darwin-mips.mk index 0509e72..e446e24 100644 --- a/libyuv.target.darwin-mips.mk +++ b/libyuv.target.darwin-mips.mk @@ -5,14 +5,12 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libyuv_libyuv_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)) # Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp,,,$(GYP_VAR_PREFIX))/libjpeg.stamp +GYP_TARGET_DEPENDENCIES := GYP_GENERATED_OUTPUTS := @@ -63,7 +61,6 @@ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -72,8 +69,6 @@ MY_CFLAGS_Debug := \ -fPIC \ -Wno-unused-local-typedefs \ -Wno-format \ - -EL \ - -mhard-float \ -ffunction-sections \ -funwind-tables \ -g \ @@ -92,6 +87,7 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ @@ -115,13 +111,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -139,7 +136,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -147,6 +144,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 \ @@ -165,7 +163,6 @@ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -174,8 +171,6 @@ MY_CFLAGS_Release := \ -fPIC \ -Wno-unused-local-typedefs \ -Wno-format \ - -EL \ - -mhard-float \ -ffunction-sections \ -funwind-tables \ -g \ @@ -217,13 +212,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -241,7 +237,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -249,6 +245,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 \ @@ -268,46 +265,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 diff --git a/libyuv.target.darwin-x86.mk b/libyuv.target.darwin-x86.mk index 8454ac0..cd82ea9 100644 --- a/libyuv.target.darwin-x86.mk +++ b/libyuv.target.darwin-x86.mk @@ -5,14 +5,12 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libyuv_libyuv_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)) # Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp,,,$(GYP_VAR_PREFIX))/libjpeg.stamp +GYP_TARGET_DEPENDENCIES := GYP_GENERATED_OUTPUTS := @@ -61,7 +59,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 \ @@ -92,6 +89,7 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ @@ -115,13 +113,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -139,7 +138,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -147,6 +146,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 \ @@ -162,7 +162,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 \ @@ -216,13 +215,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -240,7 +240,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -248,6 +248,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 \ @@ -266,46 +267,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 \ - -m32 \ - -fuse-ld=gold \ - -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 \ - -m32 \ - -fuse-ld=gold \ - -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 diff --git a/libyuv.target.darwin-x86_64.mk b/libyuv.target.darwin-x86_64.mk index 824d09f..7beeb32 100644 --- a/libyuv.target.darwin-x86_64.mk +++ b/libyuv.target.darwin-x86_64.mk @@ -5,14 +5,12 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libyuv_libyuv_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)) # Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp,,,$(GYP_VAR_PREFIX))/libjpeg.stamp +GYP_TARGET_DEPENDENCIES := GYP_GENERATED_OUTPUTS := @@ -62,7 +60,6 @@ LOCAL_SRC_FILES := \ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -91,6 +88,7 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ @@ -114,13 +112,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -138,7 +137,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -146,6 +145,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 \ @@ -162,7 +162,6 @@ LOCAL_CPPFLAGS_Debug := \ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -214,13 +213,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -238,7 +238,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -246,6 +246,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 \ @@ -264,46 +265,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 \ - -m64 \ - -fuse-ld=gold \ - -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 \ - -m64 \ - -fuse-ld=gold \ - -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 diff --git a/libyuv.target.linux-arm.mk b/libyuv.target.linux-arm.mk index a488665..c04afd0 100644 --- a/libyuv.target.linux-arm.mk +++ b/libyuv.target.linux-arm.mk @@ -5,14 +5,12 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libyuv_libyuv_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)) # Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp,,,$(GYP_VAR_PREFIX))/libjpeg.stamp +GYP_TARGET_DEPENDENCIES := GYP_GENERATED_OUTPUTS := @@ -62,7 +60,6 @@ LOCAL_SRC_FILES := \ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -72,13 +69,13 @@ MY_CFLAGS_Debug := \ -Wno-unused-local-typedefs \ -Wno-format \ -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 \ @@ -97,6 +94,7 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ @@ -120,14 +118,15 @@ 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' \ '-DHAVE_JPEG' \ '-DLIBYUV_NEON' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -145,7 +144,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -153,6 +152,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 \ @@ -170,7 +170,6 @@ LOCAL_CPPFLAGS_Debug := \ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -180,13 +179,13 @@ MY_CFLAGS_Release := \ -Wno-unused-local-typedefs \ -Wno-format \ -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 \ @@ -228,14 +227,15 @@ 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' \ '-DHAVE_JPEG' \ '-DLIBYUV_NEON' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -253,7 +253,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -261,6 +261,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 +281,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 diff --git a/libyuv.target.linux-arm64.mk b/libyuv.target.linux-arm64.mk index 468a7b0..8e7a656 100644 --- a/libyuv.target.linux-arm64.mk +++ b/libyuv.target.linux-arm64.mk @@ -5,14 +5,12 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libyuv_libyuv_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)) # Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp,,,$(GYP_VAR_PREFIX))/libjpeg.stamp +GYP_TARGET_DEPENDENCIES := GYP_GENERATED_OUTPUTS := @@ -61,7 +59,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 \ @@ -87,6 +84,7 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -funwind-tables @@ -109,13 +107,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -133,7 +132,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -141,6 +140,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 \ @@ -156,7 +156,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 \ @@ -204,13 +203,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -228,7 +228,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -236,6 +236,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 \ @@ -254,42 +255,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 \ - -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 \ - -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 diff --git a/libyuv.target.linux-mips.mk b/libyuv.target.linux-mips.mk index 0509e72..e446e24 100644 --- a/libyuv.target.linux-mips.mk +++ b/libyuv.target.linux-mips.mk @@ -5,14 +5,12 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libyuv_libyuv_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)) # Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp,,,$(GYP_VAR_PREFIX))/libjpeg.stamp +GYP_TARGET_DEPENDENCIES := GYP_GENERATED_OUTPUTS := @@ -63,7 +61,6 @@ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -72,8 +69,6 @@ MY_CFLAGS_Debug := \ -fPIC \ -Wno-unused-local-typedefs \ -Wno-format \ - -EL \ - -mhard-float \ -ffunction-sections \ -funwind-tables \ -g \ @@ -92,6 +87,7 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ @@ -115,13 +111,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -139,7 +136,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -147,6 +144,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 \ @@ -165,7 +163,6 @@ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -174,8 +171,6 @@ MY_CFLAGS_Release := \ -fPIC \ -Wno-unused-local-typedefs \ -Wno-format \ - -EL \ - -mhard-float \ -ffunction-sections \ -funwind-tables \ -g \ @@ -217,13 +212,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -241,7 +237,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -249,6 +245,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 \ @@ -268,46 +265,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 diff --git a/libyuv.target.linux-x86.mk b/libyuv.target.linux-x86.mk index 8454ac0..cd82ea9 100644 --- a/libyuv.target.linux-x86.mk +++ b/libyuv.target.linux-x86.mk @@ -5,14 +5,12 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libyuv_libyuv_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)) # Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp,,,$(GYP_VAR_PREFIX))/libjpeg.stamp +GYP_TARGET_DEPENDENCIES := GYP_GENERATED_OUTPUTS := @@ -61,7 +59,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 \ @@ -92,6 +89,7 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ @@ -115,13 +113,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -139,7 +138,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -147,6 +146,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 \ @@ -162,7 +162,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 \ @@ -216,13 +215,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -240,7 +240,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -248,6 +248,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 \ @@ -266,46 +267,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 \ - -m32 \ - -fuse-ld=gold \ - -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 \ - -m32 \ - -fuse-ld=gold \ - -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 diff --git a/libyuv.target.linux-x86_64.mk b/libyuv.target.linux-x86_64.mk index 824d09f..7beeb32 100644 --- a/libyuv.target.linux-x86_64.mk +++ b/libyuv.target.linux-x86_64.mk @@ -5,14 +5,12 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libyuv_libyuv_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)) # Make sure our deps are built first. -GYP_TARGET_DEPENDENCIES := \ - $(call intermediates-dir-for,GYP,third_party_libjpeg_libjpeg_gyp,,,$(GYP_VAR_PREFIX))/libjpeg.stamp +GYP_TARGET_DEPENDENCIES := GYP_GENERATED_OUTPUTS := @@ -62,7 +60,6 @@ LOCAL_SRC_FILES := \ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -91,6 +88,7 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ @@ -114,13 +112,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -138,7 +137,7 @@ LOCAL_C_INCLUDES_Debug := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -146,6 +145,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 \ @@ -162,7 +162,6 @@ LOCAL_CPPFLAGS_Debug := \ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -214,13 +213,14 @@ 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' \ '-DHAVE_JPEG' \ - '-DUSE_SYSTEM_LIBJPEG' \ '-DUSE_OPENSSL=1' \ '-DUSE_OPENSSL_CERTS=1' \ '-DANDROID' \ @@ -238,7 +238,7 @@ LOCAL_C_INCLUDES_Release := \ $(gyp_shared_intermediate_dir) \ $(LOCAL_PATH)/third_party/libyuv/include \ $(LOCAL_PATH)/third_party/libyuv \ - $(PWD)/external/jpeg \ + $(LOCAL_PATH)/third_party/libjpeg_turbo \ $(PWD)/frameworks/wilhelm/include \ $(PWD)/bionic \ $(PWD)/external/stlport/stlport @@ -246,6 +246,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 \ @@ -264,46 +265,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 \ - -m64 \ - -fuse-ld=gold \ - -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 \ - -m64 \ - -fuse-ld=gold \ - -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 diff --git a/libyuv_neon.target.darwin-arm.mk b/libyuv_neon.target.darwin-arm.mk index 14d07de..f4f3e35 100644 --- a/libyuv_neon.target.darwin-arm.mk +++ b/libyuv_neon.target.darwin-arm.mk @@ -5,7 +5,6 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libyuv_libyuv_neon_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)) @@ -34,7 +33,6 @@ LOCAL_SRC_FILES := \ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -45,13 +43,13 @@ MY_CFLAGS_Debug := \ -mfpu=neon \ -Wno-format \ -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 \ @@ -70,6 +68,7 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ @@ -93,11 +92,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' \ @@ -122,6 +123,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 \ @@ -139,7 +141,6 @@ LOCAL_CPPFLAGS_Debug := \ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -150,13 +151,13 @@ MY_CFLAGS_Release := \ -mfpu=neon \ -Wno-format \ -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 \ @@ -198,11 +199,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' \ @@ -227,6 +230,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 \ @@ -246,50 +250,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 diff --git a/libyuv_neon.target.linux-arm.mk b/libyuv_neon.target.linux-arm.mk index 14d07de..f4f3e35 100644 --- a/libyuv_neon.target.linux-arm.mk +++ b/libyuv_neon.target.linux-arm.mk @@ -5,7 +5,6 @@ include $(CLEAR_VARS) LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libyuv_libyuv_neon_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)) @@ -34,7 +33,6 @@ LOCAL_SRC_FILES := \ MY_CFLAGS_Debug := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -45,13 +43,13 @@ MY_CFLAGS_Debug := \ -mfpu=neon \ -Wno-format \ -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 \ @@ -70,6 +68,7 @@ MY_CFLAGS_Debug := \ -Wno-sequence-point \ -Os \ -g \ + -gdwarf-4 \ -fdata-sections \ -ffunction-sections \ -fomit-frame-pointer \ @@ -93,11 +92,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' \ @@ -122,6 +123,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 \ @@ -139,7 +141,6 @@ LOCAL_CPPFLAGS_Debug := \ MY_CFLAGS_Release := \ -fstack-protector \ --param=ssp-buffer-size=4 \ - -fno-exceptions \ -fno-strict-aliasing \ -Wno-unused-parameter \ -Wno-missing-field-initializers \ @@ -150,13 +151,13 @@ MY_CFLAGS_Release := \ -mfpu=neon \ -Wno-format \ -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 \ @@ -198,11 +199,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' \ @@ -227,6 +230,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 \ @@ -246,50 +250,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 |