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 | fe7bb57aaa4992fe212dc653eb3d44c7b4a147b7 (patch) | |
| tree | 16994b4bb754e2c21a51450dda28c1ff9c8b6ae8 | |
| parent | b9d936d96a35c484455ad9978c6e9782e880178a (diff) | |
| download | icu-fe7bb57aaa4992fe212dc653eb3d44c7b4a147b7.tar.gz | |
Update makefiles after merge of Chromium at 9ef958e74e13
This commit was generated by merge_from_chromium.py.
Change-Id: I2422517e6d56d65ab1ad4e8cd410893929785fea
30 files changed, 30 insertions, 30 deletions
diff --git a/icudata.target.darwin-arm.mk b/icudata.target.darwin-arm.mk index 2b2bdfa..9c85608 100644 --- a/icudata.target.darwin-arm.mk +++ b/icudata.target.darwin-arm.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icudata_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/icudata.target.darwin-arm64.mk b/icudata.target.darwin-arm64.mk index 61f67e1..e5b3772 100644 --- a/icudata.target.darwin-arm64.mk +++ b/icudata.target.darwin-arm64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icudata_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/icudata.target.darwin-mips.mk b/icudata.target.darwin-mips.mk index f8030c7..d1fbf6b 100644 --- a/icudata.target.darwin-mips.mk +++ b/icudata.target.darwin-mips.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icudata_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/icudata.target.darwin-x86.mk b/icudata.target.darwin-x86.mk index ea16c16..1859487 100644 --- a/icudata.target.darwin-x86.mk +++ b/icudata.target.darwin-x86.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icudata_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/icudata.target.darwin-x86_64.mk b/icudata.target.darwin-x86_64.mk index 680b257..26f6815 100644 --- a/icudata.target.darwin-x86_64.mk +++ b/icudata.target.darwin-x86_64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icudata_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/icudata.target.linux-arm.mk b/icudata.target.linux-arm.mk index 2b2bdfa..9c85608 100644 --- a/icudata.target.linux-arm.mk +++ b/icudata.target.linux-arm.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icudata_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/icudata.target.linux-arm64.mk b/icudata.target.linux-arm64.mk index 61f67e1..e5b3772 100644 --- a/icudata.target.linux-arm64.mk +++ b/icudata.target.linux-arm64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icudata_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/icudata.target.linux-mips.mk b/icudata.target.linux-mips.mk index f8030c7..d1fbf6b 100644 --- a/icudata.target.linux-mips.mk +++ b/icudata.target.linux-mips.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icudata_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/icudata.target.linux-x86.mk b/icudata.target.linux-x86.mk index ea16c16..1859487 100644 --- a/icudata.target.linux-x86.mk +++ b/icudata.target.linux-x86.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icudata_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/icudata.target.linux-x86_64.mk b/icudata.target.linux-x86_64.mk index 680b257..26f6815 100644 --- a/icudata.target.linux-x86_64.mk +++ b/icudata.target.linux-x86_64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icudata_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/icui18n.target.darwin-arm.mk b/icui18n.target.darwin-arm.mk index 9ef167a..c92206e 100644 --- a/icui18n.target.darwin-arm.mk +++ b/icui18n.target.darwin-arm.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icui18n_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/icui18n.target.darwin-arm64.mk b/icui18n.target.darwin-arm64.mk index 50271f2..1ef8e46 100644 --- a/icui18n.target.darwin-arm64.mk +++ b/icui18n.target.darwin-arm64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icui18n_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/icui18n.target.darwin-mips.mk b/icui18n.target.darwin-mips.mk index 70d94a1..292fecc 100644 --- a/icui18n.target.darwin-mips.mk +++ b/icui18n.target.darwin-mips.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icui18n_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/icui18n.target.darwin-x86.mk b/icui18n.target.darwin-x86.mk index fe61b09..818eb77 100644 --- a/icui18n.target.darwin-x86.mk +++ b/icui18n.target.darwin-x86.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icui18n_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/icui18n.target.darwin-x86_64.mk b/icui18n.target.darwin-x86_64.mk index 2ce9369..4fb9c6d 100644 --- a/icui18n.target.darwin-x86_64.mk +++ b/icui18n.target.darwin-x86_64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icui18n_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/icui18n.target.linux-arm.mk b/icui18n.target.linux-arm.mk index 9ef167a..c92206e 100644 --- a/icui18n.target.linux-arm.mk +++ b/icui18n.target.linux-arm.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icui18n_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/icui18n.target.linux-arm64.mk b/icui18n.target.linux-arm64.mk index 50271f2..1ef8e46 100644 --- a/icui18n.target.linux-arm64.mk +++ b/icui18n.target.linux-arm64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icui18n_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/icui18n.target.linux-mips.mk b/icui18n.target.linux-mips.mk index 70d94a1..292fecc 100644 --- a/icui18n.target.linux-mips.mk +++ b/icui18n.target.linux-mips.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icui18n_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/icui18n.target.linux-x86.mk b/icui18n.target.linux-x86.mk index fe61b09..818eb77 100644 --- a/icui18n.target.linux-x86.mk +++ b/icui18n.target.linux-x86.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icui18n_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/icui18n.target.linux-x86_64.mk b/icui18n.target.linux-x86_64.mk index 2ce9369..4fb9c6d 100644 --- a/icui18n.target.linux-x86_64.mk +++ b/icui18n.target.linux-x86_64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icui18n_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/icuuc.target.darwin-arm.mk b/icuuc.target.darwin-arm.mk index e2874bd..92a36f8 100644 --- a/icuuc.target.darwin-arm.mk +++ b/icuuc.target.darwin-arm.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icuuc_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/icuuc.target.darwin-arm64.mk b/icuuc.target.darwin-arm64.mk index b051d69..6c3c0ec 100644 --- a/icuuc.target.darwin-arm64.mk +++ b/icuuc.target.darwin-arm64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icuuc_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/icuuc.target.darwin-mips.mk b/icuuc.target.darwin-mips.mk index fd9a1ec..f3433d5 100644 --- a/icuuc.target.darwin-mips.mk +++ b/icuuc.target.darwin-mips.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icuuc_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/icuuc.target.darwin-x86.mk b/icuuc.target.darwin-x86.mk index 108bfa4..f264140 100644 --- a/icuuc.target.darwin-x86.mk +++ b/icuuc.target.darwin-x86.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icuuc_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/icuuc.target.darwin-x86_64.mk b/icuuc.target.darwin-x86_64.mk index 8c99a3c..3cc2693 100644 --- a/icuuc.target.darwin-x86_64.mk +++ b/icuuc.target.darwin-x86_64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icuuc_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/icuuc.target.linux-arm.mk b/icuuc.target.linux-arm.mk index e2874bd..92a36f8 100644 --- a/icuuc.target.linux-arm.mk +++ b/icuuc.target.linux-arm.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icuuc_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/icuuc.target.linux-arm64.mk b/icuuc.target.linux-arm64.mk index b051d69..6c3c0ec 100644 --- a/icuuc.target.linux-arm64.mk +++ b/icuuc.target.linux-arm64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icuuc_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/icuuc.target.linux-mips.mk b/icuuc.target.linux-mips.mk index fd9a1ec..f3433d5 100644 --- a/icuuc.target.linux-mips.mk +++ b/icuuc.target.linux-mips.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icuuc_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/icuuc.target.linux-x86.mk b/icuuc.target.linux-x86.mk index 108bfa4..f264140 100644 --- a/icuuc.target.linux-x86.mk +++ b/icuuc.target.linux-x86.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icuuc_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/icuuc.target.linux-x86_64.mk b/icuuc.target.linux-x86_64.mk index 8c99a3c..3cc2693 100644 --- a/icuuc.target.linux-x86_64.mk +++ b/icuuc.target.linux-x86_64.mk @@ -6,7 +6,7 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES LOCAL_MODULE := third_party_icu_icuuc_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)) |