diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-23 15:55:31 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-23 15:55:31 +0000 |
| commit | 88e84a1626d731ff2092fe00e2db8276903437f1 (patch) | |
| tree | 0b6261a069f1de373656f4a0ceebc34fee81e191 | |
| parent | b37b84429233a07a55af86600545089934a4fbbd (diff) | |
| download | openmax_dl-88e84a1626d731ff2092fe00e2db8276903437f1.tar.gz | |
Update makefiles after merge of Chromium at 9ef958e74e13
This commit was generated by merge_from_chromium.py.
Change-Id: I50bd2e01e09a9540e0c63d0b0dc04850530801ef
| -rw-r--r-- | dl/openmax_dl.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl.target.darwin-arm64.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl.target.darwin-mips.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl.target.darwin-x86.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl.target.darwin-x86_64.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl.target.linux-arm.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl.target.linux-arm64.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl.target.linux-mips.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl.target.linux-x86.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl.target.linux-x86_64.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl_armv7.target.darwin-arm.mk | 2 | ||||
| -rw-r--r-- | dl/openmax_dl_armv7.target.linux-arm.mk | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/dl/openmax_dl.target.darwin-arm.mk b/dl/openmax_dl.target.darwin-arm.mk index e6770a6..82b7e94 100644 --- a/dl/openmax_dl.target.darwin-arm.mk +++ b/dl/openmax_dl.target.darwin-arm.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_openmax_dl_dl_openmax_dl_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/dl/openmax_dl.target.darwin-arm64.mk b/dl/openmax_dl.target.darwin-arm64.mk index a542470..43fd7df 100644 --- a/dl/openmax_dl.target.darwin-arm64.mk +++ b/dl/openmax_dl.target.darwin-arm64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_openmax_dl_dl_openmax_dl_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/dl/openmax_dl.target.darwin-mips.mk b/dl/openmax_dl.target.darwin-mips.mk index 0a45bcd..fa3edb2 100644 --- a/dl/openmax_dl.target.darwin-mips.mk +++ b/dl/openmax_dl.target.darwin-mips.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_openmax_dl_dl_openmax_dl_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/dl/openmax_dl.target.darwin-x86.mk b/dl/openmax_dl.target.darwin-x86.mk index 437dbca..25fa5ef 100644 --- a/dl/openmax_dl.target.darwin-x86.mk +++ b/dl/openmax_dl.target.darwin-x86.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_openmax_dl_dl_openmax_dl_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/dl/openmax_dl.target.darwin-x86_64.mk b/dl/openmax_dl.target.darwin-x86_64.mk index aa64e45..595af1a 100644 --- a/dl/openmax_dl.target.darwin-x86_64.mk +++ b/dl/openmax_dl.target.darwin-x86_64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_openmax_dl_dl_openmax_dl_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/dl/openmax_dl.target.linux-arm.mk b/dl/openmax_dl.target.linux-arm.mk index e6770a6..82b7e94 100644 --- a/dl/openmax_dl.target.linux-arm.mk +++ b/dl/openmax_dl.target.linux-arm.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_openmax_dl_dl_openmax_dl_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/dl/openmax_dl.target.linux-arm64.mk b/dl/openmax_dl.target.linux-arm64.mk index a542470..43fd7df 100644 --- a/dl/openmax_dl.target.linux-arm64.mk +++ b/dl/openmax_dl.target.linux-arm64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_openmax_dl_dl_openmax_dl_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/dl/openmax_dl.target.linux-mips.mk b/dl/openmax_dl.target.linux-mips.mk index 0a45bcd..fa3edb2 100644 --- a/dl/openmax_dl.target.linux-mips.mk +++ b/dl/openmax_dl.target.linux-mips.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_openmax_dl_dl_openmax_dl_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/dl/openmax_dl.target.linux-x86.mk b/dl/openmax_dl.target.linux-x86.mk index 437dbca..25fa5ef 100644 --- a/dl/openmax_dl.target.linux-x86.mk +++ b/dl/openmax_dl.target.linux-x86.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_openmax_dl_dl_openmax_dl_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/dl/openmax_dl.target.linux-x86_64.mk b/dl/openmax_dl.target.linux-x86_64.mk index aa64e45..595af1a 100644 --- a/dl/openmax_dl.target.linux-x86_64.mk +++ b/dl/openmax_dl.target.linux-x86_64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_openmax_dl_dl_openmax_dl_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/dl/openmax_dl_armv7.target.darwin-arm.mk b/dl/openmax_dl_armv7.target.darwin-arm.mk index 72fb82f..7f64de9 100644 --- a/dl/openmax_dl_armv7.target.darwin-arm.mk +++ b/dl/openmax_dl_armv7.target.darwin-arm.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_openmax_dl_dl_openmax_dl_armv7_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/dl/openmax_dl_armv7.target.linux-arm.mk b/dl/openmax_dl_armv7.target.linux-arm.mk index 72fb82f..7f64de9 100644 --- a/dl/openmax_dl_armv7.target.linux-arm.mk +++ b/dl/openmax_dl_armv7.target.linux-arm.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_openmax_dl_dl_openmax_dl_armv7_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)) |