diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-23 15:55:30 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-23 15:55:30 +0000 |
| commit | ad057fd100c6fbc26033da3d1666e431658f10bd (patch) | |
| tree | 8c26168613175af7189cc32779cc9f9b8e140c58 | |
| parent | a64152c834a25a5838fefc8e4f01808bc055082d (diff) | |
| download | libjpeg_turbo-ad057fd100c6fbc26033da3d1666e431658f10bd.tar.gz | |
Update makefiles after merge of Chromium at 9ef958e74e13
This commit was generated by merge_from_chromium.py.
Change-Id: Iecbf4599f6715051551edb06dca908ddf7da9e26
| -rw-r--r-- | libjpeg.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.darwin-arm64.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.darwin-x86_64.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-arm64.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | libjpeg.target.linux-x86_64.mk | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/libjpeg.target.darwin-arm.mk b/libjpeg.target.darwin-arm.mk index 1971e96..5646434 100644 --- a/libjpeg.target.darwin-arm.mk +++ b/libjpeg.target.darwin-arm.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libjpeg_turbo_libjpeg_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -LOCAL_SDK_VERSION := 19 +LOCAL_SDK_VERSION := 21 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) diff --git a/libjpeg.target.darwin-arm64.mk b/libjpeg.target.darwin-arm64.mk index e547558..eebfb12 100644 --- a/libjpeg.target.darwin-arm64.mk +++ b/libjpeg.target.darwin-arm64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libjpeg_turbo_libjpeg_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -LOCAL_SDK_VERSION := 19 +LOCAL_SDK_VERSION := 21 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) diff --git a/libjpeg.target.darwin-mips.mk b/libjpeg.target.darwin-mips.mk index a3bfa08..b4747d8 100644 --- a/libjpeg.target.darwin-mips.mk +++ b/libjpeg.target.darwin-mips.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libjpeg_turbo_libjpeg_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -LOCAL_SDK_VERSION := 19 +LOCAL_SDK_VERSION := 21 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) diff --git a/libjpeg.target.darwin-x86.mk b/libjpeg.target.darwin-x86.mk index 811bf66..a9aed14 100644 --- a/libjpeg.target.darwin-x86.mk +++ b/libjpeg.target.darwin-x86.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libjpeg_turbo_libjpeg_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -LOCAL_SDK_VERSION := 19 +LOCAL_SDK_VERSION := 21 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) diff --git a/libjpeg.target.darwin-x86_64.mk b/libjpeg.target.darwin-x86_64.mk index bd31139..f717d0f 100644 --- a/libjpeg.target.darwin-x86_64.mk +++ b/libjpeg.target.darwin-x86_64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libjpeg_turbo_libjpeg_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -LOCAL_SDK_VERSION := 19 +LOCAL_SDK_VERSION := 21 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) diff --git a/libjpeg.target.linux-arm.mk b/libjpeg.target.linux-arm.mk index 1971e96..5646434 100644 --- a/libjpeg.target.linux-arm.mk +++ b/libjpeg.target.linux-arm.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libjpeg_turbo_libjpeg_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -LOCAL_SDK_VERSION := 19 +LOCAL_SDK_VERSION := 21 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) diff --git a/libjpeg.target.linux-arm64.mk b/libjpeg.target.linux-arm64.mk index e547558..eebfb12 100644 --- a/libjpeg.target.linux-arm64.mk +++ b/libjpeg.target.linux-arm64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libjpeg_turbo_libjpeg_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -LOCAL_SDK_VERSION := 19 +LOCAL_SDK_VERSION := 21 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) diff --git a/libjpeg.target.linux-mips.mk b/libjpeg.target.linux-mips.mk index a3bfa08..b4747d8 100644 --- a/libjpeg.target.linux-mips.mk +++ b/libjpeg.target.linux-mips.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libjpeg_turbo_libjpeg_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -LOCAL_SDK_VERSION := 19 +LOCAL_SDK_VERSION := 21 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) diff --git a/libjpeg.target.linux-x86.mk b/libjpeg.target.linux-x86.mk index 811bf66..a9aed14 100644 --- a/libjpeg.target.linux-x86.mk +++ b/libjpeg.target.linux-x86.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libjpeg_turbo_libjpeg_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -LOCAL_SDK_VERSION := 19 +LOCAL_SDK_VERSION := 21 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) diff --git a/libjpeg.target.linux-x86_64.mk b/libjpeg.target.linux-x86_64.mk index bd31139..f717d0f 100644 --- a/libjpeg.target.linux-x86_64.mk +++ b/libjpeg.target.linux-x86_64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_libjpeg_turbo_libjpeg_gyp LOCAL_MODULE_SUFFIX := .a LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH) -LOCAL_SDK_VERSION := 19 +LOCAL_SDK_VERSION := 21 gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX)) gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX)) |