diff --git a/icudata.host.darwin-arm.mk b/icudata.host.darwin-arm.mk
deleted file mode 100644
index a1f8d07..0000000
--- a/icudata.host.darwin-arm.mk
+++ /dev/null
@@ -1,209 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/mac/icudt46l_dat.S
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icudata
-icudata: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icudata.host.darwin-arm64.mk b/icudata.host.darwin-arm64.mk
deleted file mode 100644
index b121b35..0000000
--- a/icudata.host.darwin-arm64.mk
+++ /dev/null
@@ -1,209 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/mac/icudt46l_dat.S
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icudata
-icudata: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icudata.host.darwin-mips.mk b/icudata.host.darwin-mips.mk
deleted file mode 100644
index db78aed..0000000
--- a/icudata.host.darwin-mips.mk
+++ /dev/null
@@ -1,211 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/mac/icudt46l_dat.S
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icudata
-icudata: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icudata.host.darwin-x86.mk b/icudata.host.darwin-x86.mk
deleted file mode 100644
index a1f8d07..0000000
--- a/icudata.host.darwin-x86.mk
+++ /dev/null
@@ -1,209 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/mac/icudt46l_dat.S
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icudata
-icudata: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icudata.host.darwin-x86_64.mk b/icudata.host.darwin-x86_64.mk
deleted file mode 100644
index b121b35..0000000
--- a/icudata.host.darwin-x86_64.mk
+++ /dev/null
@@ -1,209 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/mac/icudt46l_dat.S
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icudata
-icudata: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icudata.host.linux-arm.mk b/icudata.host.linux-arm.mk
deleted file mode 100644
index da4c651..0000000
--- a/icudata.host.linux-arm.mk
+++ /dev/null
@@ -1,215 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/linux/icudt46l_dat.S
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icudata
-icudata: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icudata.host.linux-arm64.mk b/icudata.host.linux-arm64.mk
deleted file mode 100644
index 9187a3c..0000000
--- a/icudata.host.linux-arm64.mk
+++ /dev/null
@@ -1,215 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/linux/icudt46l_dat.S
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icudata
-icudata: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icudata.host.linux-mips.mk b/icudata.host.linux-mips.mk
deleted file mode 100644
index bdff1e6..0000000
--- a/icudata.host.linux-mips.mk
+++ /dev/null
@@ -1,217 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/linux/icudt46l_dat.S
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icudata
-icudata: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icudata.host.linux-x86.mk b/icudata.host.linux-x86.mk
deleted file mode 100644
index da4c651..0000000
--- a/icudata.host.linux-x86.mk
+++ /dev/null
@@ -1,215 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/linux/icudt46l_dat.S
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icudata
-icudata: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icudata.host.linux-x86_64.mk b/icudata.host.linux-x86_64.mk
deleted file mode 100644
index 9187a3c..0000000
--- a/icudata.host.linux-x86_64.mk
+++ /dev/null
@@ -1,215 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/linux/icudt46l_dat.S
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_HIDE_DATA_SYMBOL' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icudata
-icudata: third_party_icu_icudata_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icui18n.host.darwin-arm.mk b/icui18n.host.darwin-arm.mk
deleted file mode 100644
index 3a7f06d..0000000
--- a/icui18n.host.darwin-arm.mk
+++ /dev/null
@@ -1,362 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/i18n/anytrans.cpp \
-	third_party/icu/source/i18n/astro.cpp \
-	third_party/icu/source/i18n/basictz.cpp \
-	third_party/icu/source/i18n/bms.cpp \
-	third_party/icu/source/i18n/bmsearch.cpp \
-	third_party/icu/source/i18n/bocsu.c \
-	third_party/icu/source/i18n/brktrans.cpp \
-	third_party/icu/source/i18n/buddhcal.cpp \
-	third_party/icu/source/i18n/calendar.cpp \
-	third_party/icu/source/i18n/casetrn.cpp \
-	third_party/icu/source/i18n/cecal.cpp \
-	third_party/icu/source/i18n/chnsecal.cpp \
-	third_party/icu/source/i18n/choicfmt.cpp \
-	third_party/icu/source/i18n/coleitr.cpp \
-	third_party/icu/source/i18n/coll.cpp \
-	third_party/icu/source/i18n/colldata.cpp \
-	third_party/icu/source/i18n/coptccal.cpp \
-	third_party/icu/source/i18n/cpdtrans.cpp \
-	third_party/icu/source/i18n/csdetect.cpp \
-	third_party/icu/source/i18n/csmatch.cpp \
-	third_party/icu/source/i18n/csr2022.cpp \
-	third_party/icu/source/i18n/csrecog.cpp \
-	third_party/icu/source/i18n/csrmbcs.cpp \
-	third_party/icu/source/i18n/csrsbcs.cpp \
-	third_party/icu/source/i18n/csrucode.cpp \
-	third_party/icu/source/i18n/csrutf8.cpp \
-	third_party/icu/source/i18n/curramt.cpp \
-	third_party/icu/source/i18n/currfmt.cpp \
-	third_party/icu/source/i18n/currpinf.cpp \
-	third_party/icu/source/i18n/currunit.cpp \
-	third_party/icu/source/i18n/datefmt.cpp \
-	third_party/icu/source/i18n/dcfmtsym.cpp \
-	third_party/icu/source/i18n/decContext.c \
-	third_party/icu/source/i18n/decNumber.c \
-	third_party/icu/source/i18n/decimfmt.cpp \
-	third_party/icu/source/i18n/digitlst.cpp \
-	third_party/icu/source/i18n/dtfmtsym.cpp \
-	third_party/icu/source/i18n/dtitvfmt.cpp \
-	third_party/icu/source/i18n/dtitvinf.cpp \
-	third_party/icu/source/i18n/dtptngen.cpp \
-	third_party/icu/source/i18n/dtrule.cpp \
-	third_party/icu/source/i18n/esctrn.cpp \
-	third_party/icu/source/i18n/ethpccal.cpp \
-	third_party/icu/source/i18n/fmtable.cpp \
-	third_party/icu/source/i18n/fmtable_cnv.cpp \
-	third_party/icu/source/i18n/format.cpp \
-	third_party/icu/source/i18n/fphdlimp.cpp \
-	third_party/icu/source/i18n/fpositer.cpp \
-	third_party/icu/source/i18n/funcrepl.cpp \
-	third_party/icu/source/i18n/gregocal.cpp \
-	third_party/icu/source/i18n/gregoimp.cpp \
-	third_party/icu/source/i18n/hebrwcal.cpp \
-	third_party/icu/source/i18n/indiancal.cpp \
-	third_party/icu/source/i18n/inputext.cpp \
-	third_party/icu/source/i18n/islamcal.cpp \
-	third_party/icu/source/i18n/japancal.cpp \
-	third_party/icu/source/i18n/locdspnm.cpp \
-	third_party/icu/source/i18n/measfmt.cpp \
-	third_party/icu/source/i18n/measure.cpp \
-	third_party/icu/source/i18n/msgfmt.cpp \
-	third_party/icu/source/i18n/name2uni.cpp \
-	third_party/icu/source/i18n/nfrs.cpp \
-	third_party/icu/source/i18n/nfrule.cpp \
-	third_party/icu/source/i18n/nfsubs.cpp \
-	third_party/icu/source/i18n/nortrans.cpp \
-	third_party/icu/source/i18n/nultrans.cpp \
-	third_party/icu/source/i18n/numfmt.cpp \
-	third_party/icu/source/i18n/numsys.cpp \
-	third_party/icu/source/i18n/olsontz.cpp \
-	third_party/icu/source/i18n/persncal.cpp \
-	third_party/icu/source/i18n/plurfmt.cpp \
-	third_party/icu/source/i18n/plurrule.cpp \
-	third_party/icu/source/i18n/quant.cpp \
-	third_party/icu/source/i18n/rbnf.cpp \
-	third_party/icu/source/i18n/rbt.cpp \
-	third_party/icu/source/i18n/rbt_data.cpp \
-	third_party/icu/source/i18n/rbt_pars.cpp \
-	third_party/icu/source/i18n/rbt_rule.cpp \
-	third_party/icu/source/i18n/rbt_set.cpp \
-	third_party/icu/source/i18n/rbtz.cpp \
-	third_party/icu/source/i18n/regexcmp.cpp \
-	third_party/icu/source/i18n/regexst.cpp \
-	third_party/icu/source/i18n/regextxt.cpp \
-	third_party/icu/source/i18n/reldtfmt.cpp \
-	third_party/icu/source/i18n/rematch.cpp \
-	third_party/icu/source/i18n/remtrans.cpp \
-	third_party/icu/source/i18n/repattrn.cpp \
-	third_party/icu/source/i18n/search.cpp \
-	third_party/icu/source/i18n/selfmt.cpp \
-	third_party/icu/source/i18n/simpletz.cpp \
-	third_party/icu/source/i18n/smpdtfmt.cpp \
-	third_party/icu/source/i18n/sortkey.cpp \
-	third_party/icu/source/i18n/strmatch.cpp \
-	third_party/icu/source/i18n/strrepl.cpp \
-	third_party/icu/source/i18n/stsearch.cpp \
-	third_party/icu/source/i18n/taiwncal.cpp \
-	third_party/icu/source/i18n/tblcoll.cpp \
-	third_party/icu/source/i18n/timezone.cpp \
-	third_party/icu/source/i18n/titletrn.cpp \
-	third_party/icu/source/i18n/tmunit.cpp \
-	third_party/icu/source/i18n/tmutamt.cpp \
-	third_party/icu/source/i18n/tmutfmt.cpp \
-	third_party/icu/source/i18n/tolowtrn.cpp \
-	third_party/icu/source/i18n/toupptrn.cpp \
-	third_party/icu/source/i18n/translit.cpp \
-	third_party/icu/source/i18n/transreg.cpp \
-	third_party/icu/source/i18n/tridpars.cpp \
-	third_party/icu/source/i18n/tzrule.cpp \
-	third_party/icu/source/i18n/tztrans.cpp \
-	third_party/icu/source/i18n/ucal.cpp \
-	third_party/icu/source/i18n/ucln_in.c \
-	third_party/icu/source/i18n/ucol.cpp \
-	third_party/icu/source/i18n/ucol_bld.cpp \
-	third_party/icu/source/i18n/ucol_cnt.cpp \
-	third_party/icu/source/i18n/ucol_elm.cpp \
-	third_party/icu/source/i18n/ucol_res.cpp \
-	third_party/icu/source/i18n/ucol_sit.cpp \
-	third_party/icu/source/i18n/ucol_tok.cpp \
-	third_party/icu/source/i18n/ucol_wgt.cpp \
-	third_party/icu/source/i18n/ucoleitr.cpp \
-	third_party/icu/source/i18n/ucsdet.cpp \
-	third_party/icu/source/i18n/ucurr.cpp \
-	third_party/icu/source/i18n/udat.cpp \
-	third_party/icu/source/i18n/udatpg.cpp \
-	third_party/icu/source/i18n/ulocdata.c \
-	third_party/icu/source/i18n/umsg.cpp \
-	third_party/icu/source/i18n/unesctrn.cpp \
-	third_party/icu/source/i18n/uni2name.cpp \
-	third_party/icu/source/i18n/unum.cpp \
-	third_party/icu/source/i18n/uregex.cpp \
-	third_party/icu/source/i18n/uregexc.cpp \
-	third_party/icu/source/i18n/usearch.cpp \
-	third_party/icu/source/i18n/uspoof.cpp \
-	third_party/icu/source/i18n/uspoof_build.cpp \
-	third_party/icu/source/i18n/uspoof_conf.cpp \
-	third_party/icu/source/i18n/uspoof_impl.cpp \
-	third_party/icu/source/i18n/uspoof_wsconf.cpp \
-	third_party/icu/source/i18n/utmscale.c \
-	third_party/icu/source/i18n/utrans.cpp \
-	third_party/icu/source/i18n/vtzone.cpp \
-	third_party/icu/source/i18n/vzone.cpp \
-	third_party/icu/source/i18n/windtfmt.cpp \
-	third_party/icu/source/i18n/winnmfmt.cpp \
-	third_party/icu/source/i18n/wintzimpl.cpp \
-	third_party/icu/source/i18n/zonemeta.cpp \
-	third_party/icu/source/i18n/zrule.cpp \
-	third_party/icu/source/i18n/zstrfmt.cpp \
-	third_party/icu/source/i18n/ztrans.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icui18n.host.darwin-arm64.mk b/icui18n.host.darwin-arm64.mk
deleted file mode 100644
index 0fa13c8..0000000
--- a/icui18n.host.darwin-arm64.mk
+++ /dev/null
@@ -1,362 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/i18n/anytrans.cpp \
-	third_party/icu/source/i18n/astro.cpp \
-	third_party/icu/source/i18n/basictz.cpp \
-	third_party/icu/source/i18n/bms.cpp \
-	third_party/icu/source/i18n/bmsearch.cpp \
-	third_party/icu/source/i18n/bocsu.c \
-	third_party/icu/source/i18n/brktrans.cpp \
-	third_party/icu/source/i18n/buddhcal.cpp \
-	third_party/icu/source/i18n/calendar.cpp \
-	third_party/icu/source/i18n/casetrn.cpp \
-	third_party/icu/source/i18n/cecal.cpp \
-	third_party/icu/source/i18n/chnsecal.cpp \
-	third_party/icu/source/i18n/choicfmt.cpp \
-	third_party/icu/source/i18n/coleitr.cpp \
-	third_party/icu/source/i18n/coll.cpp \
-	third_party/icu/source/i18n/colldata.cpp \
-	third_party/icu/source/i18n/coptccal.cpp \
-	third_party/icu/source/i18n/cpdtrans.cpp \
-	third_party/icu/source/i18n/csdetect.cpp \
-	third_party/icu/source/i18n/csmatch.cpp \
-	third_party/icu/source/i18n/csr2022.cpp \
-	third_party/icu/source/i18n/csrecog.cpp \
-	third_party/icu/source/i18n/csrmbcs.cpp \
-	third_party/icu/source/i18n/csrsbcs.cpp \
-	third_party/icu/source/i18n/csrucode.cpp \
-	third_party/icu/source/i18n/csrutf8.cpp \
-	third_party/icu/source/i18n/curramt.cpp \
-	third_party/icu/source/i18n/currfmt.cpp \
-	third_party/icu/source/i18n/currpinf.cpp \
-	third_party/icu/source/i18n/currunit.cpp \
-	third_party/icu/source/i18n/datefmt.cpp \
-	third_party/icu/source/i18n/dcfmtsym.cpp \
-	third_party/icu/source/i18n/decContext.c \
-	third_party/icu/source/i18n/decNumber.c \
-	third_party/icu/source/i18n/decimfmt.cpp \
-	third_party/icu/source/i18n/digitlst.cpp \
-	third_party/icu/source/i18n/dtfmtsym.cpp \
-	third_party/icu/source/i18n/dtitvfmt.cpp \
-	third_party/icu/source/i18n/dtitvinf.cpp \
-	third_party/icu/source/i18n/dtptngen.cpp \
-	third_party/icu/source/i18n/dtrule.cpp \
-	third_party/icu/source/i18n/esctrn.cpp \
-	third_party/icu/source/i18n/ethpccal.cpp \
-	third_party/icu/source/i18n/fmtable.cpp \
-	third_party/icu/source/i18n/fmtable_cnv.cpp \
-	third_party/icu/source/i18n/format.cpp \
-	third_party/icu/source/i18n/fphdlimp.cpp \
-	third_party/icu/source/i18n/fpositer.cpp \
-	third_party/icu/source/i18n/funcrepl.cpp \
-	third_party/icu/source/i18n/gregocal.cpp \
-	third_party/icu/source/i18n/gregoimp.cpp \
-	third_party/icu/source/i18n/hebrwcal.cpp \
-	third_party/icu/source/i18n/indiancal.cpp \
-	third_party/icu/source/i18n/inputext.cpp \
-	third_party/icu/source/i18n/islamcal.cpp \
-	third_party/icu/source/i18n/japancal.cpp \
-	third_party/icu/source/i18n/locdspnm.cpp \
-	third_party/icu/source/i18n/measfmt.cpp \
-	third_party/icu/source/i18n/measure.cpp \
-	third_party/icu/source/i18n/msgfmt.cpp \
-	third_party/icu/source/i18n/name2uni.cpp \
-	third_party/icu/source/i18n/nfrs.cpp \
-	third_party/icu/source/i18n/nfrule.cpp \
-	third_party/icu/source/i18n/nfsubs.cpp \
-	third_party/icu/source/i18n/nortrans.cpp \
-	third_party/icu/source/i18n/nultrans.cpp \
-	third_party/icu/source/i18n/numfmt.cpp \
-	third_party/icu/source/i18n/numsys.cpp \
-	third_party/icu/source/i18n/olsontz.cpp \
-	third_party/icu/source/i18n/persncal.cpp \
-	third_party/icu/source/i18n/plurfmt.cpp \
-	third_party/icu/source/i18n/plurrule.cpp \
-	third_party/icu/source/i18n/quant.cpp \
-	third_party/icu/source/i18n/rbnf.cpp \
-	third_party/icu/source/i18n/rbt.cpp \
-	third_party/icu/source/i18n/rbt_data.cpp \
-	third_party/icu/source/i18n/rbt_pars.cpp \
-	third_party/icu/source/i18n/rbt_rule.cpp \
-	third_party/icu/source/i18n/rbt_set.cpp \
-	third_party/icu/source/i18n/rbtz.cpp \
-	third_party/icu/source/i18n/regexcmp.cpp \
-	third_party/icu/source/i18n/regexst.cpp \
-	third_party/icu/source/i18n/regextxt.cpp \
-	third_party/icu/source/i18n/reldtfmt.cpp \
-	third_party/icu/source/i18n/rematch.cpp \
-	third_party/icu/source/i18n/remtrans.cpp \
-	third_party/icu/source/i18n/repattrn.cpp \
-	third_party/icu/source/i18n/search.cpp \
-	third_party/icu/source/i18n/selfmt.cpp \
-	third_party/icu/source/i18n/simpletz.cpp \
-	third_party/icu/source/i18n/smpdtfmt.cpp \
-	third_party/icu/source/i18n/sortkey.cpp \
-	third_party/icu/source/i18n/strmatch.cpp \
-	third_party/icu/source/i18n/strrepl.cpp \
-	third_party/icu/source/i18n/stsearch.cpp \
-	third_party/icu/source/i18n/taiwncal.cpp \
-	third_party/icu/source/i18n/tblcoll.cpp \
-	third_party/icu/source/i18n/timezone.cpp \
-	third_party/icu/source/i18n/titletrn.cpp \
-	third_party/icu/source/i18n/tmunit.cpp \
-	third_party/icu/source/i18n/tmutamt.cpp \
-	third_party/icu/source/i18n/tmutfmt.cpp \
-	third_party/icu/source/i18n/tolowtrn.cpp \
-	third_party/icu/source/i18n/toupptrn.cpp \
-	third_party/icu/source/i18n/translit.cpp \
-	third_party/icu/source/i18n/transreg.cpp \
-	third_party/icu/source/i18n/tridpars.cpp \
-	third_party/icu/source/i18n/tzrule.cpp \
-	third_party/icu/source/i18n/tztrans.cpp \
-	third_party/icu/source/i18n/ucal.cpp \
-	third_party/icu/source/i18n/ucln_in.c \
-	third_party/icu/source/i18n/ucol.cpp \
-	third_party/icu/source/i18n/ucol_bld.cpp \
-	third_party/icu/source/i18n/ucol_cnt.cpp \
-	third_party/icu/source/i18n/ucol_elm.cpp \
-	third_party/icu/source/i18n/ucol_res.cpp \
-	third_party/icu/source/i18n/ucol_sit.cpp \
-	third_party/icu/source/i18n/ucol_tok.cpp \
-	third_party/icu/source/i18n/ucol_wgt.cpp \
-	third_party/icu/source/i18n/ucoleitr.cpp \
-	third_party/icu/source/i18n/ucsdet.cpp \
-	third_party/icu/source/i18n/ucurr.cpp \
-	third_party/icu/source/i18n/udat.cpp \
-	third_party/icu/source/i18n/udatpg.cpp \
-	third_party/icu/source/i18n/ulocdata.c \
-	third_party/icu/source/i18n/umsg.cpp \
-	third_party/icu/source/i18n/unesctrn.cpp \
-	third_party/icu/source/i18n/uni2name.cpp \
-	third_party/icu/source/i18n/unum.cpp \
-	third_party/icu/source/i18n/uregex.cpp \
-	third_party/icu/source/i18n/uregexc.cpp \
-	third_party/icu/source/i18n/usearch.cpp \
-	third_party/icu/source/i18n/uspoof.cpp \
-	third_party/icu/source/i18n/uspoof_build.cpp \
-	third_party/icu/source/i18n/uspoof_conf.cpp \
-	third_party/icu/source/i18n/uspoof_impl.cpp \
-	third_party/icu/source/i18n/uspoof_wsconf.cpp \
-	third_party/icu/source/i18n/utmscale.c \
-	third_party/icu/source/i18n/utrans.cpp \
-	third_party/icu/source/i18n/vtzone.cpp \
-	third_party/icu/source/i18n/vzone.cpp \
-	third_party/icu/source/i18n/windtfmt.cpp \
-	third_party/icu/source/i18n/winnmfmt.cpp \
-	third_party/icu/source/i18n/wintzimpl.cpp \
-	third_party/icu/source/i18n/zonemeta.cpp \
-	third_party/icu/source/i18n/zrule.cpp \
-	third_party/icu/source/i18n/zstrfmt.cpp \
-	third_party/icu/source/i18n/ztrans.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icui18n.host.darwin-mips.mk b/icui18n.host.darwin-mips.mk
deleted file mode 100644
index 982d707..0000000
--- a/icui18n.host.darwin-mips.mk
+++ /dev/null
@@ -1,364 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/i18n/anytrans.cpp \
-	third_party/icu/source/i18n/astro.cpp \
-	third_party/icu/source/i18n/basictz.cpp \
-	third_party/icu/source/i18n/bms.cpp \
-	third_party/icu/source/i18n/bmsearch.cpp \
-	third_party/icu/source/i18n/bocsu.c \
-	third_party/icu/source/i18n/brktrans.cpp \
-	third_party/icu/source/i18n/buddhcal.cpp \
-	third_party/icu/source/i18n/calendar.cpp \
-	third_party/icu/source/i18n/casetrn.cpp \
-	third_party/icu/source/i18n/cecal.cpp \
-	third_party/icu/source/i18n/chnsecal.cpp \
-	third_party/icu/source/i18n/choicfmt.cpp \
-	third_party/icu/source/i18n/coleitr.cpp \
-	third_party/icu/source/i18n/coll.cpp \
-	third_party/icu/source/i18n/colldata.cpp \
-	third_party/icu/source/i18n/coptccal.cpp \
-	third_party/icu/source/i18n/cpdtrans.cpp \
-	third_party/icu/source/i18n/csdetect.cpp \
-	third_party/icu/source/i18n/csmatch.cpp \
-	third_party/icu/source/i18n/csr2022.cpp \
-	third_party/icu/source/i18n/csrecog.cpp \
-	third_party/icu/source/i18n/csrmbcs.cpp \
-	third_party/icu/source/i18n/csrsbcs.cpp \
-	third_party/icu/source/i18n/csrucode.cpp \
-	third_party/icu/source/i18n/csrutf8.cpp \
-	third_party/icu/source/i18n/curramt.cpp \
-	third_party/icu/source/i18n/currfmt.cpp \
-	third_party/icu/source/i18n/currpinf.cpp \
-	third_party/icu/source/i18n/currunit.cpp \
-	third_party/icu/source/i18n/datefmt.cpp \
-	third_party/icu/source/i18n/dcfmtsym.cpp \
-	third_party/icu/source/i18n/decContext.c \
-	third_party/icu/source/i18n/decNumber.c \
-	third_party/icu/source/i18n/decimfmt.cpp \
-	third_party/icu/source/i18n/digitlst.cpp \
-	third_party/icu/source/i18n/dtfmtsym.cpp \
-	third_party/icu/source/i18n/dtitvfmt.cpp \
-	third_party/icu/source/i18n/dtitvinf.cpp \
-	third_party/icu/source/i18n/dtptngen.cpp \
-	third_party/icu/source/i18n/dtrule.cpp \
-	third_party/icu/source/i18n/esctrn.cpp \
-	third_party/icu/source/i18n/ethpccal.cpp \
-	third_party/icu/source/i18n/fmtable.cpp \
-	third_party/icu/source/i18n/fmtable_cnv.cpp \
-	third_party/icu/source/i18n/format.cpp \
-	third_party/icu/source/i18n/fphdlimp.cpp \
-	third_party/icu/source/i18n/fpositer.cpp \
-	third_party/icu/source/i18n/funcrepl.cpp \
-	third_party/icu/source/i18n/gregocal.cpp \
-	third_party/icu/source/i18n/gregoimp.cpp \
-	third_party/icu/source/i18n/hebrwcal.cpp \
-	third_party/icu/source/i18n/indiancal.cpp \
-	third_party/icu/source/i18n/inputext.cpp \
-	third_party/icu/source/i18n/islamcal.cpp \
-	third_party/icu/source/i18n/japancal.cpp \
-	third_party/icu/source/i18n/locdspnm.cpp \
-	third_party/icu/source/i18n/measfmt.cpp \
-	third_party/icu/source/i18n/measure.cpp \
-	third_party/icu/source/i18n/msgfmt.cpp \
-	third_party/icu/source/i18n/name2uni.cpp \
-	third_party/icu/source/i18n/nfrs.cpp \
-	third_party/icu/source/i18n/nfrule.cpp \
-	third_party/icu/source/i18n/nfsubs.cpp \
-	third_party/icu/source/i18n/nortrans.cpp \
-	third_party/icu/source/i18n/nultrans.cpp \
-	third_party/icu/source/i18n/numfmt.cpp \
-	third_party/icu/source/i18n/numsys.cpp \
-	third_party/icu/source/i18n/olsontz.cpp \
-	third_party/icu/source/i18n/persncal.cpp \
-	third_party/icu/source/i18n/plurfmt.cpp \
-	third_party/icu/source/i18n/plurrule.cpp \
-	third_party/icu/source/i18n/quant.cpp \
-	third_party/icu/source/i18n/rbnf.cpp \
-	third_party/icu/source/i18n/rbt.cpp \
-	third_party/icu/source/i18n/rbt_data.cpp \
-	third_party/icu/source/i18n/rbt_pars.cpp \
-	third_party/icu/source/i18n/rbt_rule.cpp \
-	third_party/icu/source/i18n/rbt_set.cpp \
-	third_party/icu/source/i18n/rbtz.cpp \
-	third_party/icu/source/i18n/regexcmp.cpp \
-	third_party/icu/source/i18n/regexst.cpp \
-	third_party/icu/source/i18n/regextxt.cpp \
-	third_party/icu/source/i18n/reldtfmt.cpp \
-	third_party/icu/source/i18n/rematch.cpp \
-	third_party/icu/source/i18n/remtrans.cpp \
-	third_party/icu/source/i18n/repattrn.cpp \
-	third_party/icu/source/i18n/search.cpp \
-	third_party/icu/source/i18n/selfmt.cpp \
-	third_party/icu/source/i18n/simpletz.cpp \
-	third_party/icu/source/i18n/smpdtfmt.cpp \
-	third_party/icu/source/i18n/sortkey.cpp \
-	third_party/icu/source/i18n/strmatch.cpp \
-	third_party/icu/source/i18n/strrepl.cpp \
-	third_party/icu/source/i18n/stsearch.cpp \
-	third_party/icu/source/i18n/taiwncal.cpp \
-	third_party/icu/source/i18n/tblcoll.cpp \
-	third_party/icu/source/i18n/timezone.cpp \
-	third_party/icu/source/i18n/titletrn.cpp \
-	third_party/icu/source/i18n/tmunit.cpp \
-	third_party/icu/source/i18n/tmutamt.cpp \
-	third_party/icu/source/i18n/tmutfmt.cpp \
-	third_party/icu/source/i18n/tolowtrn.cpp \
-	third_party/icu/source/i18n/toupptrn.cpp \
-	third_party/icu/source/i18n/translit.cpp \
-	third_party/icu/source/i18n/transreg.cpp \
-	third_party/icu/source/i18n/tridpars.cpp \
-	third_party/icu/source/i18n/tzrule.cpp \
-	third_party/icu/source/i18n/tztrans.cpp \
-	third_party/icu/source/i18n/ucal.cpp \
-	third_party/icu/source/i18n/ucln_in.c \
-	third_party/icu/source/i18n/ucol.cpp \
-	third_party/icu/source/i18n/ucol_bld.cpp \
-	third_party/icu/source/i18n/ucol_cnt.cpp \
-	third_party/icu/source/i18n/ucol_elm.cpp \
-	third_party/icu/source/i18n/ucol_res.cpp \
-	third_party/icu/source/i18n/ucol_sit.cpp \
-	third_party/icu/source/i18n/ucol_tok.cpp \
-	third_party/icu/source/i18n/ucol_wgt.cpp \
-	third_party/icu/source/i18n/ucoleitr.cpp \
-	third_party/icu/source/i18n/ucsdet.cpp \
-	third_party/icu/source/i18n/ucurr.cpp \
-	third_party/icu/source/i18n/udat.cpp \
-	third_party/icu/source/i18n/udatpg.cpp \
-	third_party/icu/source/i18n/ulocdata.c \
-	third_party/icu/source/i18n/umsg.cpp \
-	third_party/icu/source/i18n/unesctrn.cpp \
-	third_party/icu/source/i18n/uni2name.cpp \
-	third_party/icu/source/i18n/unum.cpp \
-	third_party/icu/source/i18n/uregex.cpp \
-	third_party/icu/source/i18n/uregexc.cpp \
-	third_party/icu/source/i18n/usearch.cpp \
-	third_party/icu/source/i18n/uspoof.cpp \
-	third_party/icu/source/i18n/uspoof_build.cpp \
-	third_party/icu/source/i18n/uspoof_conf.cpp \
-	third_party/icu/source/i18n/uspoof_impl.cpp \
-	third_party/icu/source/i18n/uspoof_wsconf.cpp \
-	third_party/icu/source/i18n/utmscale.c \
-	third_party/icu/source/i18n/utrans.cpp \
-	third_party/icu/source/i18n/vtzone.cpp \
-	third_party/icu/source/i18n/vzone.cpp \
-	third_party/icu/source/i18n/windtfmt.cpp \
-	third_party/icu/source/i18n/winnmfmt.cpp \
-	third_party/icu/source/i18n/wintzimpl.cpp \
-	third_party/icu/source/i18n/zonemeta.cpp \
-	third_party/icu/source/i18n/zrule.cpp \
-	third_party/icu/source/i18n/zstrfmt.cpp \
-	third_party/icu/source/i18n/ztrans.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icui18n.host.darwin-x86.mk b/icui18n.host.darwin-x86.mk
deleted file mode 100644
index 3a7f06d..0000000
--- a/icui18n.host.darwin-x86.mk
+++ /dev/null
@@ -1,362 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/i18n/anytrans.cpp \
-	third_party/icu/source/i18n/astro.cpp \
-	third_party/icu/source/i18n/basictz.cpp \
-	third_party/icu/source/i18n/bms.cpp \
-	third_party/icu/source/i18n/bmsearch.cpp \
-	third_party/icu/source/i18n/bocsu.c \
-	third_party/icu/source/i18n/brktrans.cpp \
-	third_party/icu/source/i18n/buddhcal.cpp \
-	third_party/icu/source/i18n/calendar.cpp \
-	third_party/icu/source/i18n/casetrn.cpp \
-	third_party/icu/source/i18n/cecal.cpp \
-	third_party/icu/source/i18n/chnsecal.cpp \
-	third_party/icu/source/i18n/choicfmt.cpp \
-	third_party/icu/source/i18n/coleitr.cpp \
-	third_party/icu/source/i18n/coll.cpp \
-	third_party/icu/source/i18n/colldata.cpp \
-	third_party/icu/source/i18n/coptccal.cpp \
-	third_party/icu/source/i18n/cpdtrans.cpp \
-	third_party/icu/source/i18n/csdetect.cpp \
-	third_party/icu/source/i18n/csmatch.cpp \
-	third_party/icu/source/i18n/csr2022.cpp \
-	third_party/icu/source/i18n/csrecog.cpp \
-	third_party/icu/source/i18n/csrmbcs.cpp \
-	third_party/icu/source/i18n/csrsbcs.cpp \
-	third_party/icu/source/i18n/csrucode.cpp \
-	third_party/icu/source/i18n/csrutf8.cpp \
-	third_party/icu/source/i18n/curramt.cpp \
-	third_party/icu/source/i18n/currfmt.cpp \
-	third_party/icu/source/i18n/currpinf.cpp \
-	third_party/icu/source/i18n/currunit.cpp \
-	third_party/icu/source/i18n/datefmt.cpp \
-	third_party/icu/source/i18n/dcfmtsym.cpp \
-	third_party/icu/source/i18n/decContext.c \
-	third_party/icu/source/i18n/decNumber.c \
-	third_party/icu/source/i18n/decimfmt.cpp \
-	third_party/icu/source/i18n/digitlst.cpp \
-	third_party/icu/source/i18n/dtfmtsym.cpp \
-	third_party/icu/source/i18n/dtitvfmt.cpp \
-	third_party/icu/source/i18n/dtitvinf.cpp \
-	third_party/icu/source/i18n/dtptngen.cpp \
-	third_party/icu/source/i18n/dtrule.cpp \
-	third_party/icu/source/i18n/esctrn.cpp \
-	third_party/icu/source/i18n/ethpccal.cpp \
-	third_party/icu/source/i18n/fmtable.cpp \
-	third_party/icu/source/i18n/fmtable_cnv.cpp \
-	third_party/icu/source/i18n/format.cpp \
-	third_party/icu/source/i18n/fphdlimp.cpp \
-	third_party/icu/source/i18n/fpositer.cpp \
-	third_party/icu/source/i18n/funcrepl.cpp \
-	third_party/icu/source/i18n/gregocal.cpp \
-	third_party/icu/source/i18n/gregoimp.cpp \
-	third_party/icu/source/i18n/hebrwcal.cpp \
-	third_party/icu/source/i18n/indiancal.cpp \
-	third_party/icu/source/i18n/inputext.cpp \
-	third_party/icu/source/i18n/islamcal.cpp \
-	third_party/icu/source/i18n/japancal.cpp \
-	third_party/icu/source/i18n/locdspnm.cpp \
-	third_party/icu/source/i18n/measfmt.cpp \
-	third_party/icu/source/i18n/measure.cpp \
-	third_party/icu/source/i18n/msgfmt.cpp \
-	third_party/icu/source/i18n/name2uni.cpp \
-	third_party/icu/source/i18n/nfrs.cpp \
-	third_party/icu/source/i18n/nfrule.cpp \
-	third_party/icu/source/i18n/nfsubs.cpp \
-	third_party/icu/source/i18n/nortrans.cpp \
-	third_party/icu/source/i18n/nultrans.cpp \
-	third_party/icu/source/i18n/numfmt.cpp \
-	third_party/icu/source/i18n/numsys.cpp \
-	third_party/icu/source/i18n/olsontz.cpp \
-	third_party/icu/source/i18n/persncal.cpp \
-	third_party/icu/source/i18n/plurfmt.cpp \
-	third_party/icu/source/i18n/plurrule.cpp \
-	third_party/icu/source/i18n/quant.cpp \
-	third_party/icu/source/i18n/rbnf.cpp \
-	third_party/icu/source/i18n/rbt.cpp \
-	third_party/icu/source/i18n/rbt_data.cpp \
-	third_party/icu/source/i18n/rbt_pars.cpp \
-	third_party/icu/source/i18n/rbt_rule.cpp \
-	third_party/icu/source/i18n/rbt_set.cpp \
-	third_party/icu/source/i18n/rbtz.cpp \
-	third_party/icu/source/i18n/regexcmp.cpp \
-	third_party/icu/source/i18n/regexst.cpp \
-	third_party/icu/source/i18n/regextxt.cpp \
-	third_party/icu/source/i18n/reldtfmt.cpp \
-	third_party/icu/source/i18n/rematch.cpp \
-	third_party/icu/source/i18n/remtrans.cpp \
-	third_party/icu/source/i18n/repattrn.cpp \
-	third_party/icu/source/i18n/search.cpp \
-	third_party/icu/source/i18n/selfmt.cpp \
-	third_party/icu/source/i18n/simpletz.cpp \
-	third_party/icu/source/i18n/smpdtfmt.cpp \
-	third_party/icu/source/i18n/sortkey.cpp \
-	third_party/icu/source/i18n/strmatch.cpp \
-	third_party/icu/source/i18n/strrepl.cpp \
-	third_party/icu/source/i18n/stsearch.cpp \
-	third_party/icu/source/i18n/taiwncal.cpp \
-	third_party/icu/source/i18n/tblcoll.cpp \
-	third_party/icu/source/i18n/timezone.cpp \
-	third_party/icu/source/i18n/titletrn.cpp \
-	third_party/icu/source/i18n/tmunit.cpp \
-	third_party/icu/source/i18n/tmutamt.cpp \
-	third_party/icu/source/i18n/tmutfmt.cpp \
-	third_party/icu/source/i18n/tolowtrn.cpp \
-	third_party/icu/source/i18n/toupptrn.cpp \
-	third_party/icu/source/i18n/translit.cpp \
-	third_party/icu/source/i18n/transreg.cpp \
-	third_party/icu/source/i18n/tridpars.cpp \
-	third_party/icu/source/i18n/tzrule.cpp \
-	third_party/icu/source/i18n/tztrans.cpp \
-	third_party/icu/source/i18n/ucal.cpp \
-	third_party/icu/source/i18n/ucln_in.c \
-	third_party/icu/source/i18n/ucol.cpp \
-	third_party/icu/source/i18n/ucol_bld.cpp \
-	third_party/icu/source/i18n/ucol_cnt.cpp \
-	third_party/icu/source/i18n/ucol_elm.cpp \
-	third_party/icu/source/i18n/ucol_res.cpp \
-	third_party/icu/source/i18n/ucol_sit.cpp \
-	third_party/icu/source/i18n/ucol_tok.cpp \
-	third_party/icu/source/i18n/ucol_wgt.cpp \
-	third_party/icu/source/i18n/ucoleitr.cpp \
-	third_party/icu/source/i18n/ucsdet.cpp \
-	third_party/icu/source/i18n/ucurr.cpp \
-	third_party/icu/source/i18n/udat.cpp \
-	third_party/icu/source/i18n/udatpg.cpp \
-	third_party/icu/source/i18n/ulocdata.c \
-	third_party/icu/source/i18n/umsg.cpp \
-	third_party/icu/source/i18n/unesctrn.cpp \
-	third_party/icu/source/i18n/uni2name.cpp \
-	third_party/icu/source/i18n/unum.cpp \
-	third_party/icu/source/i18n/uregex.cpp \
-	third_party/icu/source/i18n/uregexc.cpp \
-	third_party/icu/source/i18n/usearch.cpp \
-	third_party/icu/source/i18n/uspoof.cpp \
-	third_party/icu/source/i18n/uspoof_build.cpp \
-	third_party/icu/source/i18n/uspoof_conf.cpp \
-	third_party/icu/source/i18n/uspoof_impl.cpp \
-	third_party/icu/source/i18n/uspoof_wsconf.cpp \
-	third_party/icu/source/i18n/utmscale.c \
-	third_party/icu/source/i18n/utrans.cpp \
-	third_party/icu/source/i18n/vtzone.cpp \
-	third_party/icu/source/i18n/vzone.cpp \
-	third_party/icu/source/i18n/windtfmt.cpp \
-	third_party/icu/source/i18n/winnmfmt.cpp \
-	third_party/icu/source/i18n/wintzimpl.cpp \
-	third_party/icu/source/i18n/zonemeta.cpp \
-	third_party/icu/source/i18n/zrule.cpp \
-	third_party/icu/source/i18n/zstrfmt.cpp \
-	third_party/icu/source/i18n/ztrans.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icui18n.host.darwin-x86_64.mk b/icui18n.host.darwin-x86_64.mk
deleted file mode 100644
index 0fa13c8..0000000
--- a/icui18n.host.darwin-x86_64.mk
+++ /dev/null
@@ -1,362 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/i18n/anytrans.cpp \
-	third_party/icu/source/i18n/astro.cpp \
-	third_party/icu/source/i18n/basictz.cpp \
-	third_party/icu/source/i18n/bms.cpp \
-	third_party/icu/source/i18n/bmsearch.cpp \
-	third_party/icu/source/i18n/bocsu.c \
-	third_party/icu/source/i18n/brktrans.cpp \
-	third_party/icu/source/i18n/buddhcal.cpp \
-	third_party/icu/source/i18n/calendar.cpp \
-	third_party/icu/source/i18n/casetrn.cpp \
-	third_party/icu/source/i18n/cecal.cpp \
-	third_party/icu/source/i18n/chnsecal.cpp \
-	third_party/icu/source/i18n/choicfmt.cpp \
-	third_party/icu/source/i18n/coleitr.cpp \
-	third_party/icu/source/i18n/coll.cpp \
-	third_party/icu/source/i18n/colldata.cpp \
-	third_party/icu/source/i18n/coptccal.cpp \
-	third_party/icu/source/i18n/cpdtrans.cpp \
-	third_party/icu/source/i18n/csdetect.cpp \
-	third_party/icu/source/i18n/csmatch.cpp \
-	third_party/icu/source/i18n/csr2022.cpp \
-	third_party/icu/source/i18n/csrecog.cpp \
-	third_party/icu/source/i18n/csrmbcs.cpp \
-	third_party/icu/source/i18n/csrsbcs.cpp \
-	third_party/icu/source/i18n/csrucode.cpp \
-	third_party/icu/source/i18n/csrutf8.cpp \
-	third_party/icu/source/i18n/curramt.cpp \
-	third_party/icu/source/i18n/currfmt.cpp \
-	third_party/icu/source/i18n/currpinf.cpp \
-	third_party/icu/source/i18n/currunit.cpp \
-	third_party/icu/source/i18n/datefmt.cpp \
-	third_party/icu/source/i18n/dcfmtsym.cpp \
-	third_party/icu/source/i18n/decContext.c \
-	third_party/icu/source/i18n/decNumber.c \
-	third_party/icu/source/i18n/decimfmt.cpp \
-	third_party/icu/source/i18n/digitlst.cpp \
-	third_party/icu/source/i18n/dtfmtsym.cpp \
-	third_party/icu/source/i18n/dtitvfmt.cpp \
-	third_party/icu/source/i18n/dtitvinf.cpp \
-	third_party/icu/source/i18n/dtptngen.cpp \
-	third_party/icu/source/i18n/dtrule.cpp \
-	third_party/icu/source/i18n/esctrn.cpp \
-	third_party/icu/source/i18n/ethpccal.cpp \
-	third_party/icu/source/i18n/fmtable.cpp \
-	third_party/icu/source/i18n/fmtable_cnv.cpp \
-	third_party/icu/source/i18n/format.cpp \
-	third_party/icu/source/i18n/fphdlimp.cpp \
-	third_party/icu/source/i18n/fpositer.cpp \
-	third_party/icu/source/i18n/funcrepl.cpp \
-	third_party/icu/source/i18n/gregocal.cpp \
-	third_party/icu/source/i18n/gregoimp.cpp \
-	third_party/icu/source/i18n/hebrwcal.cpp \
-	third_party/icu/source/i18n/indiancal.cpp \
-	third_party/icu/source/i18n/inputext.cpp \
-	third_party/icu/source/i18n/islamcal.cpp \
-	third_party/icu/source/i18n/japancal.cpp \
-	third_party/icu/source/i18n/locdspnm.cpp \
-	third_party/icu/source/i18n/measfmt.cpp \
-	third_party/icu/source/i18n/measure.cpp \
-	third_party/icu/source/i18n/msgfmt.cpp \
-	third_party/icu/source/i18n/name2uni.cpp \
-	third_party/icu/source/i18n/nfrs.cpp \
-	third_party/icu/source/i18n/nfrule.cpp \
-	third_party/icu/source/i18n/nfsubs.cpp \
-	third_party/icu/source/i18n/nortrans.cpp \
-	third_party/icu/source/i18n/nultrans.cpp \
-	third_party/icu/source/i18n/numfmt.cpp \
-	third_party/icu/source/i18n/numsys.cpp \
-	third_party/icu/source/i18n/olsontz.cpp \
-	third_party/icu/source/i18n/persncal.cpp \
-	third_party/icu/source/i18n/plurfmt.cpp \
-	third_party/icu/source/i18n/plurrule.cpp \
-	third_party/icu/source/i18n/quant.cpp \
-	third_party/icu/source/i18n/rbnf.cpp \
-	third_party/icu/source/i18n/rbt.cpp \
-	third_party/icu/source/i18n/rbt_data.cpp \
-	third_party/icu/source/i18n/rbt_pars.cpp \
-	third_party/icu/source/i18n/rbt_rule.cpp \
-	third_party/icu/source/i18n/rbt_set.cpp \
-	third_party/icu/source/i18n/rbtz.cpp \
-	third_party/icu/source/i18n/regexcmp.cpp \
-	third_party/icu/source/i18n/regexst.cpp \
-	third_party/icu/source/i18n/regextxt.cpp \
-	third_party/icu/source/i18n/reldtfmt.cpp \
-	third_party/icu/source/i18n/rematch.cpp \
-	third_party/icu/source/i18n/remtrans.cpp \
-	third_party/icu/source/i18n/repattrn.cpp \
-	third_party/icu/source/i18n/search.cpp \
-	third_party/icu/source/i18n/selfmt.cpp \
-	third_party/icu/source/i18n/simpletz.cpp \
-	third_party/icu/source/i18n/smpdtfmt.cpp \
-	third_party/icu/source/i18n/sortkey.cpp \
-	third_party/icu/source/i18n/strmatch.cpp \
-	third_party/icu/source/i18n/strrepl.cpp \
-	third_party/icu/source/i18n/stsearch.cpp \
-	third_party/icu/source/i18n/taiwncal.cpp \
-	third_party/icu/source/i18n/tblcoll.cpp \
-	third_party/icu/source/i18n/timezone.cpp \
-	third_party/icu/source/i18n/titletrn.cpp \
-	third_party/icu/source/i18n/tmunit.cpp \
-	third_party/icu/source/i18n/tmutamt.cpp \
-	third_party/icu/source/i18n/tmutfmt.cpp \
-	third_party/icu/source/i18n/tolowtrn.cpp \
-	third_party/icu/source/i18n/toupptrn.cpp \
-	third_party/icu/source/i18n/translit.cpp \
-	third_party/icu/source/i18n/transreg.cpp \
-	third_party/icu/source/i18n/tridpars.cpp \
-	third_party/icu/source/i18n/tzrule.cpp \
-	third_party/icu/source/i18n/tztrans.cpp \
-	third_party/icu/source/i18n/ucal.cpp \
-	third_party/icu/source/i18n/ucln_in.c \
-	third_party/icu/source/i18n/ucol.cpp \
-	third_party/icu/source/i18n/ucol_bld.cpp \
-	third_party/icu/source/i18n/ucol_cnt.cpp \
-	third_party/icu/source/i18n/ucol_elm.cpp \
-	third_party/icu/source/i18n/ucol_res.cpp \
-	third_party/icu/source/i18n/ucol_sit.cpp \
-	third_party/icu/source/i18n/ucol_tok.cpp \
-	third_party/icu/source/i18n/ucol_wgt.cpp \
-	third_party/icu/source/i18n/ucoleitr.cpp \
-	third_party/icu/source/i18n/ucsdet.cpp \
-	third_party/icu/source/i18n/ucurr.cpp \
-	third_party/icu/source/i18n/udat.cpp \
-	third_party/icu/source/i18n/udatpg.cpp \
-	third_party/icu/source/i18n/ulocdata.c \
-	third_party/icu/source/i18n/umsg.cpp \
-	third_party/icu/source/i18n/unesctrn.cpp \
-	third_party/icu/source/i18n/uni2name.cpp \
-	third_party/icu/source/i18n/unum.cpp \
-	third_party/icu/source/i18n/uregex.cpp \
-	third_party/icu/source/i18n/uregexc.cpp \
-	third_party/icu/source/i18n/usearch.cpp \
-	third_party/icu/source/i18n/uspoof.cpp \
-	third_party/icu/source/i18n/uspoof_build.cpp \
-	third_party/icu/source/i18n/uspoof_conf.cpp \
-	third_party/icu/source/i18n/uspoof_impl.cpp \
-	third_party/icu/source/i18n/uspoof_wsconf.cpp \
-	third_party/icu/source/i18n/utmscale.c \
-	third_party/icu/source/i18n/utrans.cpp \
-	third_party/icu/source/i18n/vtzone.cpp \
-	third_party/icu/source/i18n/vzone.cpp \
-	third_party/icu/source/i18n/windtfmt.cpp \
-	third_party/icu/source/i18n/winnmfmt.cpp \
-	third_party/icu/source/i18n/wintzimpl.cpp \
-	third_party/icu/source/i18n/zonemeta.cpp \
-	third_party/icu/source/i18n/zrule.cpp \
-	third_party/icu/source/i18n/zstrfmt.cpp \
-	third_party/icu/source/i18n/ztrans.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icui18n.host.linux-arm.mk b/icui18n.host.linux-arm.mk
deleted file mode 100644
index 30f1851..0000000
--- a/icui18n.host.linux-arm.mk
+++ /dev/null
@@ -1,368 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/i18n/anytrans.cpp \
-	third_party/icu/source/i18n/astro.cpp \
-	third_party/icu/source/i18n/basictz.cpp \
-	third_party/icu/source/i18n/bms.cpp \
-	third_party/icu/source/i18n/bmsearch.cpp \
-	third_party/icu/source/i18n/bocsu.c \
-	third_party/icu/source/i18n/brktrans.cpp \
-	third_party/icu/source/i18n/buddhcal.cpp \
-	third_party/icu/source/i18n/calendar.cpp \
-	third_party/icu/source/i18n/casetrn.cpp \
-	third_party/icu/source/i18n/cecal.cpp \
-	third_party/icu/source/i18n/chnsecal.cpp \
-	third_party/icu/source/i18n/choicfmt.cpp \
-	third_party/icu/source/i18n/coleitr.cpp \
-	third_party/icu/source/i18n/coll.cpp \
-	third_party/icu/source/i18n/colldata.cpp \
-	third_party/icu/source/i18n/coptccal.cpp \
-	third_party/icu/source/i18n/cpdtrans.cpp \
-	third_party/icu/source/i18n/csdetect.cpp \
-	third_party/icu/source/i18n/csmatch.cpp \
-	third_party/icu/source/i18n/csr2022.cpp \
-	third_party/icu/source/i18n/csrecog.cpp \
-	third_party/icu/source/i18n/csrmbcs.cpp \
-	third_party/icu/source/i18n/csrsbcs.cpp \
-	third_party/icu/source/i18n/csrucode.cpp \
-	third_party/icu/source/i18n/csrutf8.cpp \
-	third_party/icu/source/i18n/curramt.cpp \
-	third_party/icu/source/i18n/currfmt.cpp \
-	third_party/icu/source/i18n/currpinf.cpp \
-	third_party/icu/source/i18n/currunit.cpp \
-	third_party/icu/source/i18n/datefmt.cpp \
-	third_party/icu/source/i18n/dcfmtsym.cpp \
-	third_party/icu/source/i18n/decContext.c \
-	third_party/icu/source/i18n/decNumber.c \
-	third_party/icu/source/i18n/decimfmt.cpp \
-	third_party/icu/source/i18n/digitlst.cpp \
-	third_party/icu/source/i18n/dtfmtsym.cpp \
-	third_party/icu/source/i18n/dtitvfmt.cpp \
-	third_party/icu/source/i18n/dtitvinf.cpp \
-	third_party/icu/source/i18n/dtptngen.cpp \
-	third_party/icu/source/i18n/dtrule.cpp \
-	third_party/icu/source/i18n/esctrn.cpp \
-	third_party/icu/source/i18n/ethpccal.cpp \
-	third_party/icu/source/i18n/fmtable.cpp \
-	third_party/icu/source/i18n/fmtable_cnv.cpp \
-	third_party/icu/source/i18n/format.cpp \
-	third_party/icu/source/i18n/fphdlimp.cpp \
-	third_party/icu/source/i18n/fpositer.cpp \
-	third_party/icu/source/i18n/funcrepl.cpp \
-	third_party/icu/source/i18n/gregocal.cpp \
-	third_party/icu/source/i18n/gregoimp.cpp \
-	third_party/icu/source/i18n/hebrwcal.cpp \
-	third_party/icu/source/i18n/indiancal.cpp \
-	third_party/icu/source/i18n/inputext.cpp \
-	third_party/icu/source/i18n/islamcal.cpp \
-	third_party/icu/source/i18n/japancal.cpp \
-	third_party/icu/source/i18n/locdspnm.cpp \
-	third_party/icu/source/i18n/measfmt.cpp \
-	third_party/icu/source/i18n/measure.cpp \
-	third_party/icu/source/i18n/msgfmt.cpp \
-	third_party/icu/source/i18n/name2uni.cpp \
-	third_party/icu/source/i18n/nfrs.cpp \
-	third_party/icu/source/i18n/nfrule.cpp \
-	third_party/icu/source/i18n/nfsubs.cpp \
-	third_party/icu/source/i18n/nortrans.cpp \
-	third_party/icu/source/i18n/nultrans.cpp \
-	third_party/icu/source/i18n/numfmt.cpp \
-	third_party/icu/source/i18n/numsys.cpp \
-	third_party/icu/source/i18n/olsontz.cpp \
-	third_party/icu/source/i18n/persncal.cpp \
-	third_party/icu/source/i18n/plurfmt.cpp \
-	third_party/icu/source/i18n/plurrule.cpp \
-	third_party/icu/source/i18n/quant.cpp \
-	third_party/icu/source/i18n/rbnf.cpp \
-	third_party/icu/source/i18n/rbt.cpp \
-	third_party/icu/source/i18n/rbt_data.cpp \
-	third_party/icu/source/i18n/rbt_pars.cpp \
-	third_party/icu/source/i18n/rbt_rule.cpp \
-	third_party/icu/source/i18n/rbt_set.cpp \
-	third_party/icu/source/i18n/rbtz.cpp \
-	third_party/icu/source/i18n/regexcmp.cpp \
-	third_party/icu/source/i18n/regexst.cpp \
-	third_party/icu/source/i18n/regextxt.cpp \
-	third_party/icu/source/i18n/reldtfmt.cpp \
-	third_party/icu/source/i18n/rematch.cpp \
-	third_party/icu/source/i18n/remtrans.cpp \
-	third_party/icu/source/i18n/repattrn.cpp \
-	third_party/icu/source/i18n/search.cpp \
-	third_party/icu/source/i18n/selfmt.cpp \
-	third_party/icu/source/i18n/simpletz.cpp \
-	third_party/icu/source/i18n/smpdtfmt.cpp \
-	third_party/icu/source/i18n/sortkey.cpp \
-	third_party/icu/source/i18n/strmatch.cpp \
-	third_party/icu/source/i18n/strrepl.cpp \
-	third_party/icu/source/i18n/stsearch.cpp \
-	third_party/icu/source/i18n/taiwncal.cpp \
-	third_party/icu/source/i18n/tblcoll.cpp \
-	third_party/icu/source/i18n/timezone.cpp \
-	third_party/icu/source/i18n/titletrn.cpp \
-	third_party/icu/source/i18n/tmunit.cpp \
-	third_party/icu/source/i18n/tmutamt.cpp \
-	third_party/icu/source/i18n/tmutfmt.cpp \
-	third_party/icu/source/i18n/tolowtrn.cpp \
-	third_party/icu/source/i18n/toupptrn.cpp \
-	third_party/icu/source/i18n/translit.cpp \
-	third_party/icu/source/i18n/transreg.cpp \
-	third_party/icu/source/i18n/tridpars.cpp \
-	third_party/icu/source/i18n/tzrule.cpp \
-	third_party/icu/source/i18n/tztrans.cpp \
-	third_party/icu/source/i18n/ucal.cpp \
-	third_party/icu/source/i18n/ucln_in.c \
-	third_party/icu/source/i18n/ucol.cpp \
-	third_party/icu/source/i18n/ucol_bld.cpp \
-	third_party/icu/source/i18n/ucol_cnt.cpp \
-	third_party/icu/source/i18n/ucol_elm.cpp \
-	third_party/icu/source/i18n/ucol_res.cpp \
-	third_party/icu/source/i18n/ucol_sit.cpp \
-	third_party/icu/source/i18n/ucol_tok.cpp \
-	third_party/icu/source/i18n/ucol_wgt.cpp \
-	third_party/icu/source/i18n/ucoleitr.cpp \
-	third_party/icu/source/i18n/ucsdet.cpp \
-	third_party/icu/source/i18n/ucurr.cpp \
-	third_party/icu/source/i18n/udat.cpp \
-	third_party/icu/source/i18n/udatpg.cpp \
-	third_party/icu/source/i18n/ulocdata.c \
-	third_party/icu/source/i18n/umsg.cpp \
-	third_party/icu/source/i18n/unesctrn.cpp \
-	third_party/icu/source/i18n/uni2name.cpp \
-	third_party/icu/source/i18n/unum.cpp \
-	third_party/icu/source/i18n/uregex.cpp \
-	third_party/icu/source/i18n/uregexc.cpp \
-	third_party/icu/source/i18n/usearch.cpp \
-	third_party/icu/source/i18n/uspoof.cpp \
-	third_party/icu/source/i18n/uspoof_build.cpp \
-	third_party/icu/source/i18n/uspoof_conf.cpp \
-	third_party/icu/source/i18n/uspoof_impl.cpp \
-	third_party/icu/source/i18n/uspoof_wsconf.cpp \
-	third_party/icu/source/i18n/utmscale.c \
-	third_party/icu/source/i18n/utrans.cpp \
-	third_party/icu/source/i18n/vtzone.cpp \
-	third_party/icu/source/i18n/vzone.cpp \
-	third_party/icu/source/i18n/windtfmt.cpp \
-	third_party/icu/source/i18n/winnmfmt.cpp \
-	third_party/icu/source/i18n/wintzimpl.cpp \
-	third_party/icu/source/i18n/zonemeta.cpp \
-	third_party/icu/source/i18n/zrule.cpp \
-	third_party/icu/source/i18n/zstrfmt.cpp \
-	third_party/icu/source/i18n/ztrans.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icui18n.host.linux-arm64.mk b/icui18n.host.linux-arm64.mk
deleted file mode 100644
index 2be6b81..0000000
--- a/icui18n.host.linux-arm64.mk
+++ /dev/null
@@ -1,368 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/i18n/anytrans.cpp \
-	third_party/icu/source/i18n/astro.cpp \
-	third_party/icu/source/i18n/basictz.cpp \
-	third_party/icu/source/i18n/bms.cpp \
-	third_party/icu/source/i18n/bmsearch.cpp \
-	third_party/icu/source/i18n/bocsu.c \
-	third_party/icu/source/i18n/brktrans.cpp \
-	third_party/icu/source/i18n/buddhcal.cpp \
-	third_party/icu/source/i18n/calendar.cpp \
-	third_party/icu/source/i18n/casetrn.cpp \
-	third_party/icu/source/i18n/cecal.cpp \
-	third_party/icu/source/i18n/chnsecal.cpp \
-	third_party/icu/source/i18n/choicfmt.cpp \
-	third_party/icu/source/i18n/coleitr.cpp \
-	third_party/icu/source/i18n/coll.cpp \
-	third_party/icu/source/i18n/colldata.cpp \
-	third_party/icu/source/i18n/coptccal.cpp \
-	third_party/icu/source/i18n/cpdtrans.cpp \
-	third_party/icu/source/i18n/csdetect.cpp \
-	third_party/icu/source/i18n/csmatch.cpp \
-	third_party/icu/source/i18n/csr2022.cpp \
-	third_party/icu/source/i18n/csrecog.cpp \
-	third_party/icu/source/i18n/csrmbcs.cpp \
-	third_party/icu/source/i18n/csrsbcs.cpp \
-	third_party/icu/source/i18n/csrucode.cpp \
-	third_party/icu/source/i18n/csrutf8.cpp \
-	third_party/icu/source/i18n/curramt.cpp \
-	third_party/icu/source/i18n/currfmt.cpp \
-	third_party/icu/source/i18n/currpinf.cpp \
-	third_party/icu/source/i18n/currunit.cpp \
-	third_party/icu/source/i18n/datefmt.cpp \
-	third_party/icu/source/i18n/dcfmtsym.cpp \
-	third_party/icu/source/i18n/decContext.c \
-	third_party/icu/source/i18n/decNumber.c \
-	third_party/icu/source/i18n/decimfmt.cpp \
-	third_party/icu/source/i18n/digitlst.cpp \
-	third_party/icu/source/i18n/dtfmtsym.cpp \
-	third_party/icu/source/i18n/dtitvfmt.cpp \
-	third_party/icu/source/i18n/dtitvinf.cpp \
-	third_party/icu/source/i18n/dtptngen.cpp \
-	third_party/icu/source/i18n/dtrule.cpp \
-	third_party/icu/source/i18n/esctrn.cpp \
-	third_party/icu/source/i18n/ethpccal.cpp \
-	third_party/icu/source/i18n/fmtable.cpp \
-	third_party/icu/source/i18n/fmtable_cnv.cpp \
-	third_party/icu/source/i18n/format.cpp \
-	third_party/icu/source/i18n/fphdlimp.cpp \
-	third_party/icu/source/i18n/fpositer.cpp \
-	third_party/icu/source/i18n/funcrepl.cpp \
-	third_party/icu/source/i18n/gregocal.cpp \
-	third_party/icu/source/i18n/gregoimp.cpp \
-	third_party/icu/source/i18n/hebrwcal.cpp \
-	third_party/icu/source/i18n/indiancal.cpp \
-	third_party/icu/source/i18n/inputext.cpp \
-	third_party/icu/source/i18n/islamcal.cpp \
-	third_party/icu/source/i18n/japancal.cpp \
-	third_party/icu/source/i18n/locdspnm.cpp \
-	third_party/icu/source/i18n/measfmt.cpp \
-	third_party/icu/source/i18n/measure.cpp \
-	third_party/icu/source/i18n/msgfmt.cpp \
-	third_party/icu/source/i18n/name2uni.cpp \
-	third_party/icu/source/i18n/nfrs.cpp \
-	third_party/icu/source/i18n/nfrule.cpp \
-	third_party/icu/source/i18n/nfsubs.cpp \
-	third_party/icu/source/i18n/nortrans.cpp \
-	third_party/icu/source/i18n/nultrans.cpp \
-	third_party/icu/source/i18n/numfmt.cpp \
-	third_party/icu/source/i18n/numsys.cpp \
-	third_party/icu/source/i18n/olsontz.cpp \
-	third_party/icu/source/i18n/persncal.cpp \
-	third_party/icu/source/i18n/plurfmt.cpp \
-	third_party/icu/source/i18n/plurrule.cpp \
-	third_party/icu/source/i18n/quant.cpp \
-	third_party/icu/source/i18n/rbnf.cpp \
-	third_party/icu/source/i18n/rbt.cpp \
-	third_party/icu/source/i18n/rbt_data.cpp \
-	third_party/icu/source/i18n/rbt_pars.cpp \
-	third_party/icu/source/i18n/rbt_rule.cpp \
-	third_party/icu/source/i18n/rbt_set.cpp \
-	third_party/icu/source/i18n/rbtz.cpp \
-	third_party/icu/source/i18n/regexcmp.cpp \
-	third_party/icu/source/i18n/regexst.cpp \
-	third_party/icu/source/i18n/regextxt.cpp \
-	third_party/icu/source/i18n/reldtfmt.cpp \
-	third_party/icu/source/i18n/rematch.cpp \
-	third_party/icu/source/i18n/remtrans.cpp \
-	third_party/icu/source/i18n/repattrn.cpp \
-	third_party/icu/source/i18n/search.cpp \
-	third_party/icu/source/i18n/selfmt.cpp \
-	third_party/icu/source/i18n/simpletz.cpp \
-	third_party/icu/source/i18n/smpdtfmt.cpp \
-	third_party/icu/source/i18n/sortkey.cpp \
-	third_party/icu/source/i18n/strmatch.cpp \
-	third_party/icu/source/i18n/strrepl.cpp \
-	third_party/icu/source/i18n/stsearch.cpp \
-	third_party/icu/source/i18n/taiwncal.cpp \
-	third_party/icu/source/i18n/tblcoll.cpp \
-	third_party/icu/source/i18n/timezone.cpp \
-	third_party/icu/source/i18n/titletrn.cpp \
-	third_party/icu/source/i18n/tmunit.cpp \
-	third_party/icu/source/i18n/tmutamt.cpp \
-	third_party/icu/source/i18n/tmutfmt.cpp \
-	third_party/icu/source/i18n/tolowtrn.cpp \
-	third_party/icu/source/i18n/toupptrn.cpp \
-	third_party/icu/source/i18n/translit.cpp \
-	third_party/icu/source/i18n/transreg.cpp \
-	third_party/icu/source/i18n/tridpars.cpp \
-	third_party/icu/source/i18n/tzrule.cpp \
-	third_party/icu/source/i18n/tztrans.cpp \
-	third_party/icu/source/i18n/ucal.cpp \
-	third_party/icu/source/i18n/ucln_in.c \
-	third_party/icu/source/i18n/ucol.cpp \
-	third_party/icu/source/i18n/ucol_bld.cpp \
-	third_party/icu/source/i18n/ucol_cnt.cpp \
-	third_party/icu/source/i18n/ucol_elm.cpp \
-	third_party/icu/source/i18n/ucol_res.cpp \
-	third_party/icu/source/i18n/ucol_sit.cpp \
-	third_party/icu/source/i18n/ucol_tok.cpp \
-	third_party/icu/source/i18n/ucol_wgt.cpp \
-	third_party/icu/source/i18n/ucoleitr.cpp \
-	third_party/icu/source/i18n/ucsdet.cpp \
-	third_party/icu/source/i18n/ucurr.cpp \
-	third_party/icu/source/i18n/udat.cpp \
-	third_party/icu/source/i18n/udatpg.cpp \
-	third_party/icu/source/i18n/ulocdata.c \
-	third_party/icu/source/i18n/umsg.cpp \
-	third_party/icu/source/i18n/unesctrn.cpp \
-	third_party/icu/source/i18n/uni2name.cpp \
-	third_party/icu/source/i18n/unum.cpp \
-	third_party/icu/source/i18n/uregex.cpp \
-	third_party/icu/source/i18n/uregexc.cpp \
-	third_party/icu/source/i18n/usearch.cpp \
-	third_party/icu/source/i18n/uspoof.cpp \
-	third_party/icu/source/i18n/uspoof_build.cpp \
-	third_party/icu/source/i18n/uspoof_conf.cpp \
-	third_party/icu/source/i18n/uspoof_impl.cpp \
-	third_party/icu/source/i18n/uspoof_wsconf.cpp \
-	third_party/icu/source/i18n/utmscale.c \
-	third_party/icu/source/i18n/utrans.cpp \
-	third_party/icu/source/i18n/vtzone.cpp \
-	third_party/icu/source/i18n/vzone.cpp \
-	third_party/icu/source/i18n/windtfmt.cpp \
-	third_party/icu/source/i18n/winnmfmt.cpp \
-	third_party/icu/source/i18n/wintzimpl.cpp \
-	third_party/icu/source/i18n/zonemeta.cpp \
-	third_party/icu/source/i18n/zrule.cpp \
-	third_party/icu/source/i18n/zstrfmt.cpp \
-	third_party/icu/source/i18n/ztrans.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icui18n.host.linux-mips.mk b/icui18n.host.linux-mips.mk
deleted file mode 100644
index 1cf0d15..0000000
--- a/icui18n.host.linux-mips.mk
+++ /dev/null
@@ -1,370 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/i18n/anytrans.cpp \
-	third_party/icu/source/i18n/astro.cpp \
-	third_party/icu/source/i18n/basictz.cpp \
-	third_party/icu/source/i18n/bms.cpp \
-	third_party/icu/source/i18n/bmsearch.cpp \
-	third_party/icu/source/i18n/bocsu.c \
-	third_party/icu/source/i18n/brktrans.cpp \
-	third_party/icu/source/i18n/buddhcal.cpp \
-	third_party/icu/source/i18n/calendar.cpp \
-	third_party/icu/source/i18n/casetrn.cpp \
-	third_party/icu/source/i18n/cecal.cpp \
-	third_party/icu/source/i18n/chnsecal.cpp \
-	third_party/icu/source/i18n/choicfmt.cpp \
-	third_party/icu/source/i18n/coleitr.cpp \
-	third_party/icu/source/i18n/coll.cpp \
-	third_party/icu/source/i18n/colldata.cpp \
-	third_party/icu/source/i18n/coptccal.cpp \
-	third_party/icu/source/i18n/cpdtrans.cpp \
-	third_party/icu/source/i18n/csdetect.cpp \
-	third_party/icu/source/i18n/csmatch.cpp \
-	third_party/icu/source/i18n/csr2022.cpp \
-	third_party/icu/source/i18n/csrecog.cpp \
-	third_party/icu/source/i18n/csrmbcs.cpp \
-	third_party/icu/source/i18n/csrsbcs.cpp \
-	third_party/icu/source/i18n/csrucode.cpp \
-	third_party/icu/source/i18n/csrutf8.cpp \
-	third_party/icu/source/i18n/curramt.cpp \
-	third_party/icu/source/i18n/currfmt.cpp \
-	third_party/icu/source/i18n/currpinf.cpp \
-	third_party/icu/source/i18n/currunit.cpp \
-	third_party/icu/source/i18n/datefmt.cpp \
-	third_party/icu/source/i18n/dcfmtsym.cpp \
-	third_party/icu/source/i18n/decContext.c \
-	third_party/icu/source/i18n/decNumber.c \
-	third_party/icu/source/i18n/decimfmt.cpp \
-	third_party/icu/source/i18n/digitlst.cpp \
-	third_party/icu/source/i18n/dtfmtsym.cpp \
-	third_party/icu/source/i18n/dtitvfmt.cpp \
-	third_party/icu/source/i18n/dtitvinf.cpp \
-	third_party/icu/source/i18n/dtptngen.cpp \
-	third_party/icu/source/i18n/dtrule.cpp \
-	third_party/icu/source/i18n/esctrn.cpp \
-	third_party/icu/source/i18n/ethpccal.cpp \
-	third_party/icu/source/i18n/fmtable.cpp \
-	third_party/icu/source/i18n/fmtable_cnv.cpp \
-	third_party/icu/source/i18n/format.cpp \
-	third_party/icu/source/i18n/fphdlimp.cpp \
-	third_party/icu/source/i18n/fpositer.cpp \
-	third_party/icu/source/i18n/funcrepl.cpp \
-	third_party/icu/source/i18n/gregocal.cpp \
-	third_party/icu/source/i18n/gregoimp.cpp \
-	third_party/icu/source/i18n/hebrwcal.cpp \
-	third_party/icu/source/i18n/indiancal.cpp \
-	third_party/icu/source/i18n/inputext.cpp \
-	third_party/icu/source/i18n/islamcal.cpp \
-	third_party/icu/source/i18n/japancal.cpp \
-	third_party/icu/source/i18n/locdspnm.cpp \
-	third_party/icu/source/i18n/measfmt.cpp \
-	third_party/icu/source/i18n/measure.cpp \
-	third_party/icu/source/i18n/msgfmt.cpp \
-	third_party/icu/source/i18n/name2uni.cpp \
-	third_party/icu/source/i18n/nfrs.cpp \
-	third_party/icu/source/i18n/nfrule.cpp \
-	third_party/icu/source/i18n/nfsubs.cpp \
-	third_party/icu/source/i18n/nortrans.cpp \
-	third_party/icu/source/i18n/nultrans.cpp \
-	third_party/icu/source/i18n/numfmt.cpp \
-	third_party/icu/source/i18n/numsys.cpp \
-	third_party/icu/source/i18n/olsontz.cpp \
-	third_party/icu/source/i18n/persncal.cpp \
-	third_party/icu/source/i18n/plurfmt.cpp \
-	third_party/icu/source/i18n/plurrule.cpp \
-	third_party/icu/source/i18n/quant.cpp \
-	third_party/icu/source/i18n/rbnf.cpp \
-	third_party/icu/source/i18n/rbt.cpp \
-	third_party/icu/source/i18n/rbt_data.cpp \
-	third_party/icu/source/i18n/rbt_pars.cpp \
-	third_party/icu/source/i18n/rbt_rule.cpp \
-	third_party/icu/source/i18n/rbt_set.cpp \
-	third_party/icu/source/i18n/rbtz.cpp \
-	third_party/icu/source/i18n/regexcmp.cpp \
-	third_party/icu/source/i18n/regexst.cpp \
-	third_party/icu/source/i18n/regextxt.cpp \
-	third_party/icu/source/i18n/reldtfmt.cpp \
-	third_party/icu/source/i18n/rematch.cpp \
-	third_party/icu/source/i18n/remtrans.cpp \
-	third_party/icu/source/i18n/repattrn.cpp \
-	third_party/icu/source/i18n/search.cpp \
-	third_party/icu/source/i18n/selfmt.cpp \
-	third_party/icu/source/i18n/simpletz.cpp \
-	third_party/icu/source/i18n/smpdtfmt.cpp \
-	third_party/icu/source/i18n/sortkey.cpp \
-	third_party/icu/source/i18n/strmatch.cpp \
-	third_party/icu/source/i18n/strrepl.cpp \
-	third_party/icu/source/i18n/stsearch.cpp \
-	third_party/icu/source/i18n/taiwncal.cpp \
-	third_party/icu/source/i18n/tblcoll.cpp \
-	third_party/icu/source/i18n/timezone.cpp \
-	third_party/icu/source/i18n/titletrn.cpp \
-	third_party/icu/source/i18n/tmunit.cpp \
-	third_party/icu/source/i18n/tmutamt.cpp \
-	third_party/icu/source/i18n/tmutfmt.cpp \
-	third_party/icu/source/i18n/tolowtrn.cpp \
-	third_party/icu/source/i18n/toupptrn.cpp \
-	third_party/icu/source/i18n/translit.cpp \
-	third_party/icu/source/i18n/transreg.cpp \
-	third_party/icu/source/i18n/tridpars.cpp \
-	third_party/icu/source/i18n/tzrule.cpp \
-	third_party/icu/source/i18n/tztrans.cpp \
-	third_party/icu/source/i18n/ucal.cpp \
-	third_party/icu/source/i18n/ucln_in.c \
-	third_party/icu/source/i18n/ucol.cpp \
-	third_party/icu/source/i18n/ucol_bld.cpp \
-	third_party/icu/source/i18n/ucol_cnt.cpp \
-	third_party/icu/source/i18n/ucol_elm.cpp \
-	third_party/icu/source/i18n/ucol_res.cpp \
-	third_party/icu/source/i18n/ucol_sit.cpp \
-	third_party/icu/source/i18n/ucol_tok.cpp \
-	third_party/icu/source/i18n/ucol_wgt.cpp \
-	third_party/icu/source/i18n/ucoleitr.cpp \
-	third_party/icu/source/i18n/ucsdet.cpp \
-	third_party/icu/source/i18n/ucurr.cpp \
-	third_party/icu/source/i18n/udat.cpp \
-	third_party/icu/source/i18n/udatpg.cpp \
-	third_party/icu/source/i18n/ulocdata.c \
-	third_party/icu/source/i18n/umsg.cpp \
-	third_party/icu/source/i18n/unesctrn.cpp \
-	third_party/icu/source/i18n/uni2name.cpp \
-	third_party/icu/source/i18n/unum.cpp \
-	third_party/icu/source/i18n/uregex.cpp \
-	third_party/icu/source/i18n/uregexc.cpp \
-	third_party/icu/source/i18n/usearch.cpp \
-	third_party/icu/source/i18n/uspoof.cpp \
-	third_party/icu/source/i18n/uspoof_build.cpp \
-	third_party/icu/source/i18n/uspoof_conf.cpp \
-	third_party/icu/source/i18n/uspoof_impl.cpp \
-	third_party/icu/source/i18n/uspoof_wsconf.cpp \
-	third_party/icu/source/i18n/utmscale.c \
-	third_party/icu/source/i18n/utrans.cpp \
-	third_party/icu/source/i18n/vtzone.cpp \
-	third_party/icu/source/i18n/vzone.cpp \
-	third_party/icu/source/i18n/windtfmt.cpp \
-	third_party/icu/source/i18n/winnmfmt.cpp \
-	third_party/icu/source/i18n/wintzimpl.cpp \
-	third_party/icu/source/i18n/zonemeta.cpp \
-	third_party/icu/source/i18n/zrule.cpp \
-	third_party/icu/source/i18n/zstrfmt.cpp \
-	third_party/icu/source/i18n/ztrans.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icui18n.host.linux-x86.mk b/icui18n.host.linux-x86.mk
deleted file mode 100644
index 30f1851..0000000
--- a/icui18n.host.linux-x86.mk
+++ /dev/null
@@ -1,368 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/i18n/anytrans.cpp \
-	third_party/icu/source/i18n/astro.cpp \
-	third_party/icu/source/i18n/basictz.cpp \
-	third_party/icu/source/i18n/bms.cpp \
-	third_party/icu/source/i18n/bmsearch.cpp \
-	third_party/icu/source/i18n/bocsu.c \
-	third_party/icu/source/i18n/brktrans.cpp \
-	third_party/icu/source/i18n/buddhcal.cpp \
-	third_party/icu/source/i18n/calendar.cpp \
-	third_party/icu/source/i18n/casetrn.cpp \
-	third_party/icu/source/i18n/cecal.cpp \
-	third_party/icu/source/i18n/chnsecal.cpp \
-	third_party/icu/source/i18n/choicfmt.cpp \
-	third_party/icu/source/i18n/coleitr.cpp \
-	third_party/icu/source/i18n/coll.cpp \
-	third_party/icu/source/i18n/colldata.cpp \
-	third_party/icu/source/i18n/coptccal.cpp \
-	third_party/icu/source/i18n/cpdtrans.cpp \
-	third_party/icu/source/i18n/csdetect.cpp \
-	third_party/icu/source/i18n/csmatch.cpp \
-	third_party/icu/source/i18n/csr2022.cpp \
-	third_party/icu/source/i18n/csrecog.cpp \
-	third_party/icu/source/i18n/csrmbcs.cpp \
-	third_party/icu/source/i18n/csrsbcs.cpp \
-	third_party/icu/source/i18n/csrucode.cpp \
-	third_party/icu/source/i18n/csrutf8.cpp \
-	third_party/icu/source/i18n/curramt.cpp \
-	third_party/icu/source/i18n/currfmt.cpp \
-	third_party/icu/source/i18n/currpinf.cpp \
-	third_party/icu/source/i18n/currunit.cpp \
-	third_party/icu/source/i18n/datefmt.cpp \
-	third_party/icu/source/i18n/dcfmtsym.cpp \
-	third_party/icu/source/i18n/decContext.c \
-	third_party/icu/source/i18n/decNumber.c \
-	third_party/icu/source/i18n/decimfmt.cpp \
-	third_party/icu/source/i18n/digitlst.cpp \
-	third_party/icu/source/i18n/dtfmtsym.cpp \
-	third_party/icu/source/i18n/dtitvfmt.cpp \
-	third_party/icu/source/i18n/dtitvinf.cpp \
-	third_party/icu/source/i18n/dtptngen.cpp \
-	third_party/icu/source/i18n/dtrule.cpp \
-	third_party/icu/source/i18n/esctrn.cpp \
-	third_party/icu/source/i18n/ethpccal.cpp \
-	third_party/icu/source/i18n/fmtable.cpp \
-	third_party/icu/source/i18n/fmtable_cnv.cpp \
-	third_party/icu/source/i18n/format.cpp \
-	third_party/icu/source/i18n/fphdlimp.cpp \
-	third_party/icu/source/i18n/fpositer.cpp \
-	third_party/icu/source/i18n/funcrepl.cpp \
-	third_party/icu/source/i18n/gregocal.cpp \
-	third_party/icu/source/i18n/gregoimp.cpp \
-	third_party/icu/source/i18n/hebrwcal.cpp \
-	third_party/icu/source/i18n/indiancal.cpp \
-	third_party/icu/source/i18n/inputext.cpp \
-	third_party/icu/source/i18n/islamcal.cpp \
-	third_party/icu/source/i18n/japancal.cpp \
-	third_party/icu/source/i18n/locdspnm.cpp \
-	third_party/icu/source/i18n/measfmt.cpp \
-	third_party/icu/source/i18n/measure.cpp \
-	third_party/icu/source/i18n/msgfmt.cpp \
-	third_party/icu/source/i18n/name2uni.cpp \
-	third_party/icu/source/i18n/nfrs.cpp \
-	third_party/icu/source/i18n/nfrule.cpp \
-	third_party/icu/source/i18n/nfsubs.cpp \
-	third_party/icu/source/i18n/nortrans.cpp \
-	third_party/icu/source/i18n/nultrans.cpp \
-	third_party/icu/source/i18n/numfmt.cpp \
-	third_party/icu/source/i18n/numsys.cpp \
-	third_party/icu/source/i18n/olsontz.cpp \
-	third_party/icu/source/i18n/persncal.cpp \
-	third_party/icu/source/i18n/plurfmt.cpp \
-	third_party/icu/source/i18n/plurrule.cpp \
-	third_party/icu/source/i18n/quant.cpp \
-	third_party/icu/source/i18n/rbnf.cpp \
-	third_party/icu/source/i18n/rbt.cpp \
-	third_party/icu/source/i18n/rbt_data.cpp \
-	third_party/icu/source/i18n/rbt_pars.cpp \
-	third_party/icu/source/i18n/rbt_rule.cpp \
-	third_party/icu/source/i18n/rbt_set.cpp \
-	third_party/icu/source/i18n/rbtz.cpp \
-	third_party/icu/source/i18n/regexcmp.cpp \
-	third_party/icu/source/i18n/regexst.cpp \
-	third_party/icu/source/i18n/regextxt.cpp \
-	third_party/icu/source/i18n/reldtfmt.cpp \
-	third_party/icu/source/i18n/rematch.cpp \
-	third_party/icu/source/i18n/remtrans.cpp \
-	third_party/icu/source/i18n/repattrn.cpp \
-	third_party/icu/source/i18n/search.cpp \
-	third_party/icu/source/i18n/selfmt.cpp \
-	third_party/icu/source/i18n/simpletz.cpp \
-	third_party/icu/source/i18n/smpdtfmt.cpp \
-	third_party/icu/source/i18n/sortkey.cpp \
-	third_party/icu/source/i18n/strmatch.cpp \
-	third_party/icu/source/i18n/strrepl.cpp \
-	third_party/icu/source/i18n/stsearch.cpp \
-	third_party/icu/source/i18n/taiwncal.cpp \
-	third_party/icu/source/i18n/tblcoll.cpp \
-	third_party/icu/source/i18n/timezone.cpp \
-	third_party/icu/source/i18n/titletrn.cpp \
-	third_party/icu/source/i18n/tmunit.cpp \
-	third_party/icu/source/i18n/tmutamt.cpp \
-	third_party/icu/source/i18n/tmutfmt.cpp \
-	third_party/icu/source/i18n/tolowtrn.cpp \
-	third_party/icu/source/i18n/toupptrn.cpp \
-	third_party/icu/source/i18n/translit.cpp \
-	third_party/icu/source/i18n/transreg.cpp \
-	third_party/icu/source/i18n/tridpars.cpp \
-	third_party/icu/source/i18n/tzrule.cpp \
-	third_party/icu/source/i18n/tztrans.cpp \
-	third_party/icu/source/i18n/ucal.cpp \
-	third_party/icu/source/i18n/ucln_in.c \
-	third_party/icu/source/i18n/ucol.cpp \
-	third_party/icu/source/i18n/ucol_bld.cpp \
-	third_party/icu/source/i18n/ucol_cnt.cpp \
-	third_party/icu/source/i18n/ucol_elm.cpp \
-	third_party/icu/source/i18n/ucol_res.cpp \
-	third_party/icu/source/i18n/ucol_sit.cpp \
-	third_party/icu/source/i18n/ucol_tok.cpp \
-	third_party/icu/source/i18n/ucol_wgt.cpp \
-	third_party/icu/source/i18n/ucoleitr.cpp \
-	third_party/icu/source/i18n/ucsdet.cpp \
-	third_party/icu/source/i18n/ucurr.cpp \
-	third_party/icu/source/i18n/udat.cpp \
-	third_party/icu/source/i18n/udatpg.cpp \
-	third_party/icu/source/i18n/ulocdata.c \
-	third_party/icu/source/i18n/umsg.cpp \
-	third_party/icu/source/i18n/unesctrn.cpp \
-	third_party/icu/source/i18n/uni2name.cpp \
-	third_party/icu/source/i18n/unum.cpp \
-	third_party/icu/source/i18n/uregex.cpp \
-	third_party/icu/source/i18n/uregexc.cpp \
-	third_party/icu/source/i18n/usearch.cpp \
-	third_party/icu/source/i18n/uspoof.cpp \
-	third_party/icu/source/i18n/uspoof_build.cpp \
-	third_party/icu/source/i18n/uspoof_conf.cpp \
-	third_party/icu/source/i18n/uspoof_impl.cpp \
-	third_party/icu/source/i18n/uspoof_wsconf.cpp \
-	third_party/icu/source/i18n/utmscale.c \
-	third_party/icu/source/i18n/utrans.cpp \
-	third_party/icu/source/i18n/vtzone.cpp \
-	third_party/icu/source/i18n/vzone.cpp \
-	third_party/icu/source/i18n/windtfmt.cpp \
-	third_party/icu/source/i18n/winnmfmt.cpp \
-	third_party/icu/source/i18n/wintzimpl.cpp \
-	third_party/icu/source/i18n/zonemeta.cpp \
-	third_party/icu/source/i18n/zrule.cpp \
-	third_party/icu/source/i18n/zstrfmt.cpp \
-	third_party/icu/source/i18n/ztrans.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icui18n.host.linux-x86_64.mk b/icui18n.host.linux-x86_64.mk
deleted file mode 100644
index 2be6b81..0000000
--- a/icui18n.host.linux-x86_64.mk
+++ /dev/null
@@ -1,368 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/i18n/anytrans.cpp \
-	third_party/icu/source/i18n/astro.cpp \
-	third_party/icu/source/i18n/basictz.cpp \
-	third_party/icu/source/i18n/bms.cpp \
-	third_party/icu/source/i18n/bmsearch.cpp \
-	third_party/icu/source/i18n/bocsu.c \
-	third_party/icu/source/i18n/brktrans.cpp \
-	third_party/icu/source/i18n/buddhcal.cpp \
-	third_party/icu/source/i18n/calendar.cpp \
-	third_party/icu/source/i18n/casetrn.cpp \
-	third_party/icu/source/i18n/cecal.cpp \
-	third_party/icu/source/i18n/chnsecal.cpp \
-	third_party/icu/source/i18n/choicfmt.cpp \
-	third_party/icu/source/i18n/coleitr.cpp \
-	third_party/icu/source/i18n/coll.cpp \
-	third_party/icu/source/i18n/colldata.cpp \
-	third_party/icu/source/i18n/coptccal.cpp \
-	third_party/icu/source/i18n/cpdtrans.cpp \
-	third_party/icu/source/i18n/csdetect.cpp \
-	third_party/icu/source/i18n/csmatch.cpp \
-	third_party/icu/source/i18n/csr2022.cpp \
-	third_party/icu/source/i18n/csrecog.cpp \
-	third_party/icu/source/i18n/csrmbcs.cpp \
-	third_party/icu/source/i18n/csrsbcs.cpp \
-	third_party/icu/source/i18n/csrucode.cpp \
-	third_party/icu/source/i18n/csrutf8.cpp \
-	third_party/icu/source/i18n/curramt.cpp \
-	third_party/icu/source/i18n/currfmt.cpp \
-	third_party/icu/source/i18n/currpinf.cpp \
-	third_party/icu/source/i18n/currunit.cpp \
-	third_party/icu/source/i18n/datefmt.cpp \
-	third_party/icu/source/i18n/dcfmtsym.cpp \
-	third_party/icu/source/i18n/decContext.c \
-	third_party/icu/source/i18n/decNumber.c \
-	third_party/icu/source/i18n/decimfmt.cpp \
-	third_party/icu/source/i18n/digitlst.cpp \
-	third_party/icu/source/i18n/dtfmtsym.cpp \
-	third_party/icu/source/i18n/dtitvfmt.cpp \
-	third_party/icu/source/i18n/dtitvinf.cpp \
-	third_party/icu/source/i18n/dtptngen.cpp \
-	third_party/icu/source/i18n/dtrule.cpp \
-	third_party/icu/source/i18n/esctrn.cpp \
-	third_party/icu/source/i18n/ethpccal.cpp \
-	third_party/icu/source/i18n/fmtable.cpp \
-	third_party/icu/source/i18n/fmtable_cnv.cpp \
-	third_party/icu/source/i18n/format.cpp \
-	third_party/icu/source/i18n/fphdlimp.cpp \
-	third_party/icu/source/i18n/fpositer.cpp \
-	third_party/icu/source/i18n/funcrepl.cpp \
-	third_party/icu/source/i18n/gregocal.cpp \
-	third_party/icu/source/i18n/gregoimp.cpp \
-	third_party/icu/source/i18n/hebrwcal.cpp \
-	third_party/icu/source/i18n/indiancal.cpp \
-	third_party/icu/source/i18n/inputext.cpp \
-	third_party/icu/source/i18n/islamcal.cpp \
-	third_party/icu/source/i18n/japancal.cpp \
-	third_party/icu/source/i18n/locdspnm.cpp \
-	third_party/icu/source/i18n/measfmt.cpp \
-	third_party/icu/source/i18n/measure.cpp \
-	third_party/icu/source/i18n/msgfmt.cpp \
-	third_party/icu/source/i18n/name2uni.cpp \
-	third_party/icu/source/i18n/nfrs.cpp \
-	third_party/icu/source/i18n/nfrule.cpp \
-	third_party/icu/source/i18n/nfsubs.cpp \
-	third_party/icu/source/i18n/nortrans.cpp \
-	third_party/icu/source/i18n/nultrans.cpp \
-	third_party/icu/source/i18n/numfmt.cpp \
-	third_party/icu/source/i18n/numsys.cpp \
-	third_party/icu/source/i18n/olsontz.cpp \
-	third_party/icu/source/i18n/persncal.cpp \
-	third_party/icu/source/i18n/plurfmt.cpp \
-	third_party/icu/source/i18n/plurrule.cpp \
-	third_party/icu/source/i18n/quant.cpp \
-	third_party/icu/source/i18n/rbnf.cpp \
-	third_party/icu/source/i18n/rbt.cpp \
-	third_party/icu/source/i18n/rbt_data.cpp \
-	third_party/icu/source/i18n/rbt_pars.cpp \
-	third_party/icu/source/i18n/rbt_rule.cpp \
-	third_party/icu/source/i18n/rbt_set.cpp \
-	third_party/icu/source/i18n/rbtz.cpp \
-	third_party/icu/source/i18n/regexcmp.cpp \
-	third_party/icu/source/i18n/regexst.cpp \
-	third_party/icu/source/i18n/regextxt.cpp \
-	third_party/icu/source/i18n/reldtfmt.cpp \
-	third_party/icu/source/i18n/rematch.cpp \
-	third_party/icu/source/i18n/remtrans.cpp \
-	third_party/icu/source/i18n/repattrn.cpp \
-	third_party/icu/source/i18n/search.cpp \
-	third_party/icu/source/i18n/selfmt.cpp \
-	third_party/icu/source/i18n/simpletz.cpp \
-	third_party/icu/source/i18n/smpdtfmt.cpp \
-	third_party/icu/source/i18n/sortkey.cpp \
-	third_party/icu/source/i18n/strmatch.cpp \
-	third_party/icu/source/i18n/strrepl.cpp \
-	third_party/icu/source/i18n/stsearch.cpp \
-	third_party/icu/source/i18n/taiwncal.cpp \
-	third_party/icu/source/i18n/tblcoll.cpp \
-	third_party/icu/source/i18n/timezone.cpp \
-	third_party/icu/source/i18n/titletrn.cpp \
-	third_party/icu/source/i18n/tmunit.cpp \
-	third_party/icu/source/i18n/tmutamt.cpp \
-	third_party/icu/source/i18n/tmutfmt.cpp \
-	third_party/icu/source/i18n/tolowtrn.cpp \
-	third_party/icu/source/i18n/toupptrn.cpp \
-	third_party/icu/source/i18n/translit.cpp \
-	third_party/icu/source/i18n/transreg.cpp \
-	third_party/icu/source/i18n/tridpars.cpp \
-	third_party/icu/source/i18n/tzrule.cpp \
-	third_party/icu/source/i18n/tztrans.cpp \
-	third_party/icu/source/i18n/ucal.cpp \
-	third_party/icu/source/i18n/ucln_in.c \
-	third_party/icu/source/i18n/ucol.cpp \
-	third_party/icu/source/i18n/ucol_bld.cpp \
-	third_party/icu/source/i18n/ucol_cnt.cpp \
-	third_party/icu/source/i18n/ucol_elm.cpp \
-	third_party/icu/source/i18n/ucol_res.cpp \
-	third_party/icu/source/i18n/ucol_sit.cpp \
-	third_party/icu/source/i18n/ucol_tok.cpp \
-	third_party/icu/source/i18n/ucol_wgt.cpp \
-	third_party/icu/source/i18n/ucoleitr.cpp \
-	third_party/icu/source/i18n/ucsdet.cpp \
-	third_party/icu/source/i18n/ucurr.cpp \
-	third_party/icu/source/i18n/udat.cpp \
-	third_party/icu/source/i18n/udatpg.cpp \
-	third_party/icu/source/i18n/ulocdata.c \
-	third_party/icu/source/i18n/umsg.cpp \
-	third_party/icu/source/i18n/unesctrn.cpp \
-	third_party/icu/source/i18n/uni2name.cpp \
-	third_party/icu/source/i18n/unum.cpp \
-	third_party/icu/source/i18n/uregex.cpp \
-	third_party/icu/source/i18n/uregexc.cpp \
-	third_party/icu/source/i18n/usearch.cpp \
-	third_party/icu/source/i18n/uspoof.cpp \
-	third_party/icu/source/i18n/uspoof_build.cpp \
-	third_party/icu/source/i18n/uspoof_conf.cpp \
-	third_party/icu/source/i18n/uspoof_impl.cpp \
-	third_party/icu/source/i18n/uspoof_wsconf.cpp \
-	third_party/icu/source/i18n/utmscale.c \
-	third_party/icu/source/i18n/utrans.cpp \
-	third_party/icu/source/i18n/vtzone.cpp \
-	third_party/icu/source/i18n/vzone.cpp \
-	third_party/icu/source/i18n/windtfmt.cpp \
-	third_party/icu/source/i18n/winnmfmt.cpp \
-	third_party/icu/source/i18n/wintzimpl.cpp \
-	third_party/icu/source/i18n/zonemeta.cpp \
-	third_party/icu/source/i18n/zrule.cpp \
-	third_party/icu/source/i18n/zstrfmt.cpp \
-	third_party/icu/source/i18n/ztrans.cpp
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-fno-builtin-sin \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_I18N_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icui18n.target.darwin-arm.mk b/icui18n.target.darwin-arm.mk
deleted file mode 100644
index b4acc0a..0000000
--- a/icui18n.target.darwin-arm.mk
+++ /dev/null
@@ -1,190 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icui18n_gyp
-LOCAL_MODULE_STEM := icui18n
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icui18n_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icui18n shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/i18n --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target" unicode/basictz.h unicode/bmsearch.h unicode/bms.h unicode/calendar.h unicode/choicfmt.h unicode/coleitr.h unicode/colldata.h unicode/coll.h unicode/curramt.h unicode/currpinf.h unicode/currunit.h unicode/datefmt.h unicode/dcfmtsym.h unicode/decimfmt.h unicode/dtfmtsym.h unicode/dtitvfmt.h unicode/dtitvinf.h unicode/dtptngen.h unicode/dtrule.h unicode/fieldpos.h unicode/fmtable.h unicode/format.h unicode/fpositer.h unicode/gregocal.h unicode/locdspnm.h unicode/measfmt.h unicode/measunit.h unicode/measure.h unicode/msgfmt.h unicode/numfmt.h unicode/numsys.h unicode/plurfmt.h unicode/plurrule.h unicode/rbnf.h unicode/rbtz.h unicode/regex.h unicode/search.h unicode/selfmt.h unicode/simpletz.h unicode/smpdtfmt.h unicode/sortkey.h unicode/stsearch.h unicode/tblcoll.h unicode/timezone.h unicode/tmunit.h unicode/tmutamt.h unicode/tmutfmt.h unicode/translit.h unicode/tzrule.h unicode/tztrans.h unicode/ucal.h unicode/ucoleitr.h unicode/ucol.h unicode/ucsdet.h unicode/ucurr.h unicode/udat.h unicode/udatpg.h unicode/uldnames.h unicode/ulocdata.h unicode/umsg.h unicode/unirepl.h unicode/unum.h unicode/uregex.h unicode/usearch.h unicode/uspoof.h unicode/utmscale.h unicode/utrans.h unicode/vtzone.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icui18n.target.darwin-arm64.mk b/icui18n.target.darwin-arm64.mk
deleted file mode 100644
index b4acc0a..0000000
--- a/icui18n.target.darwin-arm64.mk
+++ /dev/null
@@ -1,190 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icui18n_gyp
-LOCAL_MODULE_STEM := icui18n
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icui18n_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icui18n shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/i18n --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target" unicode/basictz.h unicode/bmsearch.h unicode/bms.h unicode/calendar.h unicode/choicfmt.h unicode/coleitr.h unicode/colldata.h unicode/coll.h unicode/curramt.h unicode/currpinf.h unicode/currunit.h unicode/datefmt.h unicode/dcfmtsym.h unicode/decimfmt.h unicode/dtfmtsym.h unicode/dtitvfmt.h unicode/dtitvinf.h unicode/dtptngen.h unicode/dtrule.h unicode/fieldpos.h unicode/fmtable.h unicode/format.h unicode/fpositer.h unicode/gregocal.h unicode/locdspnm.h unicode/measfmt.h unicode/measunit.h unicode/measure.h unicode/msgfmt.h unicode/numfmt.h unicode/numsys.h unicode/plurfmt.h unicode/plurrule.h unicode/rbnf.h unicode/rbtz.h unicode/regex.h unicode/search.h unicode/selfmt.h unicode/simpletz.h unicode/smpdtfmt.h unicode/sortkey.h unicode/stsearch.h unicode/tblcoll.h unicode/timezone.h unicode/tmunit.h unicode/tmutamt.h unicode/tmutfmt.h unicode/translit.h unicode/tzrule.h unicode/tztrans.h unicode/ucal.h unicode/ucoleitr.h unicode/ucol.h unicode/ucsdet.h unicode/ucurr.h unicode/udat.h unicode/udatpg.h unicode/uldnames.h unicode/ulocdata.h unicode/umsg.h unicode/unirepl.h unicode/unum.h unicode/uregex.h unicode/usearch.h unicode/uspoof.h unicode/utmscale.h unicode/utrans.h unicode/vtzone.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icui18n.target.darwin-mips.mk b/icui18n.target.darwin-mips.mk
deleted file mode 100644
index b4acc0a..0000000
--- a/icui18n.target.darwin-mips.mk
+++ /dev/null
@@ -1,190 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icui18n_gyp
-LOCAL_MODULE_STEM := icui18n
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icui18n_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icui18n shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/i18n --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target" unicode/basictz.h unicode/bmsearch.h unicode/bms.h unicode/calendar.h unicode/choicfmt.h unicode/coleitr.h unicode/colldata.h unicode/coll.h unicode/curramt.h unicode/currpinf.h unicode/currunit.h unicode/datefmt.h unicode/dcfmtsym.h unicode/decimfmt.h unicode/dtfmtsym.h unicode/dtitvfmt.h unicode/dtitvinf.h unicode/dtptngen.h unicode/dtrule.h unicode/fieldpos.h unicode/fmtable.h unicode/format.h unicode/fpositer.h unicode/gregocal.h unicode/locdspnm.h unicode/measfmt.h unicode/measunit.h unicode/measure.h unicode/msgfmt.h unicode/numfmt.h unicode/numsys.h unicode/plurfmt.h unicode/plurrule.h unicode/rbnf.h unicode/rbtz.h unicode/regex.h unicode/search.h unicode/selfmt.h unicode/simpletz.h unicode/smpdtfmt.h unicode/sortkey.h unicode/stsearch.h unicode/tblcoll.h unicode/timezone.h unicode/tmunit.h unicode/tmutamt.h unicode/tmutfmt.h unicode/translit.h unicode/tzrule.h unicode/tztrans.h unicode/ucal.h unicode/ucoleitr.h unicode/ucol.h unicode/ucsdet.h unicode/ucurr.h unicode/udat.h unicode/udatpg.h unicode/uldnames.h unicode/ulocdata.h unicode/umsg.h unicode/unirepl.h unicode/unum.h unicode/uregex.h unicode/usearch.h unicode/uspoof.h unicode/utmscale.h unicode/utrans.h unicode/vtzone.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icui18n.target.darwin-x86.mk b/icui18n.target.darwin-x86.mk
deleted file mode 100644
index b4acc0a..0000000
--- a/icui18n.target.darwin-x86.mk
+++ /dev/null
@@ -1,190 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icui18n_gyp
-LOCAL_MODULE_STEM := icui18n
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icui18n_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icui18n shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/i18n --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target" unicode/basictz.h unicode/bmsearch.h unicode/bms.h unicode/calendar.h unicode/choicfmt.h unicode/coleitr.h unicode/colldata.h unicode/coll.h unicode/curramt.h unicode/currpinf.h unicode/currunit.h unicode/datefmt.h unicode/dcfmtsym.h unicode/decimfmt.h unicode/dtfmtsym.h unicode/dtitvfmt.h unicode/dtitvinf.h unicode/dtptngen.h unicode/dtrule.h unicode/fieldpos.h unicode/fmtable.h unicode/format.h unicode/fpositer.h unicode/gregocal.h unicode/locdspnm.h unicode/measfmt.h unicode/measunit.h unicode/measure.h unicode/msgfmt.h unicode/numfmt.h unicode/numsys.h unicode/plurfmt.h unicode/plurrule.h unicode/rbnf.h unicode/rbtz.h unicode/regex.h unicode/search.h unicode/selfmt.h unicode/simpletz.h unicode/smpdtfmt.h unicode/sortkey.h unicode/stsearch.h unicode/tblcoll.h unicode/timezone.h unicode/tmunit.h unicode/tmutamt.h unicode/tmutfmt.h unicode/translit.h unicode/tzrule.h unicode/tztrans.h unicode/ucal.h unicode/ucoleitr.h unicode/ucol.h unicode/ucsdet.h unicode/ucurr.h unicode/udat.h unicode/udatpg.h unicode/uldnames.h unicode/ulocdata.h unicode/umsg.h unicode/unirepl.h unicode/unum.h unicode/uregex.h unicode/usearch.h unicode/uspoof.h unicode/utmscale.h unicode/utrans.h unicode/vtzone.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icui18n.target.darwin-x86_64.mk b/icui18n.target.darwin-x86_64.mk
deleted file mode 100644
index b4acc0a..0000000
--- a/icui18n.target.darwin-x86_64.mk
+++ /dev/null
@@ -1,190 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icui18n_gyp
-LOCAL_MODULE_STEM := icui18n
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icui18n_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icui18n shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/i18n --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target" unicode/basictz.h unicode/bmsearch.h unicode/bms.h unicode/calendar.h unicode/choicfmt.h unicode/coleitr.h unicode/colldata.h unicode/coll.h unicode/curramt.h unicode/currpinf.h unicode/currunit.h unicode/datefmt.h unicode/dcfmtsym.h unicode/decimfmt.h unicode/dtfmtsym.h unicode/dtitvfmt.h unicode/dtitvinf.h unicode/dtptngen.h unicode/dtrule.h unicode/fieldpos.h unicode/fmtable.h unicode/format.h unicode/fpositer.h unicode/gregocal.h unicode/locdspnm.h unicode/measfmt.h unicode/measunit.h unicode/measure.h unicode/msgfmt.h unicode/numfmt.h unicode/numsys.h unicode/plurfmt.h unicode/plurrule.h unicode/rbnf.h unicode/rbtz.h unicode/regex.h unicode/search.h unicode/selfmt.h unicode/simpletz.h unicode/smpdtfmt.h unicode/sortkey.h unicode/stsearch.h unicode/tblcoll.h unicode/timezone.h unicode/tmunit.h unicode/tmutamt.h unicode/tmutfmt.h unicode/translit.h unicode/tzrule.h unicode/tztrans.h unicode/ucal.h unicode/ucoleitr.h unicode/ucol.h unicode/ucsdet.h unicode/ucurr.h unicode/udat.h unicode/udatpg.h unicode/uldnames.h unicode/ulocdata.h unicode/umsg.h unicode/unirepl.h unicode/unum.h unicode/uregex.h unicode/usearch.h unicode/uspoof.h unicode/utmscale.h unicode/utrans.h unicode/vtzone.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icui18n.target.linux-arm.mk b/icui18n.target.linux-arm.mk
deleted file mode 100644
index b4acc0a..0000000
--- a/icui18n.target.linux-arm.mk
+++ /dev/null
@@ -1,190 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icui18n_gyp
-LOCAL_MODULE_STEM := icui18n
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icui18n_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icui18n shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/i18n --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target" unicode/basictz.h unicode/bmsearch.h unicode/bms.h unicode/calendar.h unicode/choicfmt.h unicode/coleitr.h unicode/colldata.h unicode/coll.h unicode/curramt.h unicode/currpinf.h unicode/currunit.h unicode/datefmt.h unicode/dcfmtsym.h unicode/decimfmt.h unicode/dtfmtsym.h unicode/dtitvfmt.h unicode/dtitvinf.h unicode/dtptngen.h unicode/dtrule.h unicode/fieldpos.h unicode/fmtable.h unicode/format.h unicode/fpositer.h unicode/gregocal.h unicode/locdspnm.h unicode/measfmt.h unicode/measunit.h unicode/measure.h unicode/msgfmt.h unicode/numfmt.h unicode/numsys.h unicode/plurfmt.h unicode/plurrule.h unicode/rbnf.h unicode/rbtz.h unicode/regex.h unicode/search.h unicode/selfmt.h unicode/simpletz.h unicode/smpdtfmt.h unicode/sortkey.h unicode/stsearch.h unicode/tblcoll.h unicode/timezone.h unicode/tmunit.h unicode/tmutamt.h unicode/tmutfmt.h unicode/translit.h unicode/tzrule.h unicode/tztrans.h unicode/ucal.h unicode/ucoleitr.h unicode/ucol.h unicode/ucsdet.h unicode/ucurr.h unicode/udat.h unicode/udatpg.h unicode/uldnames.h unicode/ulocdata.h unicode/umsg.h unicode/unirepl.h unicode/unum.h unicode/uregex.h unicode/usearch.h unicode/uspoof.h unicode/utmscale.h unicode/utrans.h unicode/vtzone.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icui18n.target.linux-arm64.mk b/icui18n.target.linux-arm64.mk
deleted file mode 100644
index b4acc0a..0000000
--- a/icui18n.target.linux-arm64.mk
+++ /dev/null
@@ -1,190 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icui18n_gyp
-LOCAL_MODULE_STEM := icui18n
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icui18n_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icui18n shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/i18n --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target" unicode/basictz.h unicode/bmsearch.h unicode/bms.h unicode/calendar.h unicode/choicfmt.h unicode/coleitr.h unicode/colldata.h unicode/coll.h unicode/curramt.h unicode/currpinf.h unicode/currunit.h unicode/datefmt.h unicode/dcfmtsym.h unicode/decimfmt.h unicode/dtfmtsym.h unicode/dtitvfmt.h unicode/dtitvinf.h unicode/dtptngen.h unicode/dtrule.h unicode/fieldpos.h unicode/fmtable.h unicode/format.h unicode/fpositer.h unicode/gregocal.h unicode/locdspnm.h unicode/measfmt.h unicode/measunit.h unicode/measure.h unicode/msgfmt.h unicode/numfmt.h unicode/numsys.h unicode/plurfmt.h unicode/plurrule.h unicode/rbnf.h unicode/rbtz.h unicode/regex.h unicode/search.h unicode/selfmt.h unicode/simpletz.h unicode/smpdtfmt.h unicode/sortkey.h unicode/stsearch.h unicode/tblcoll.h unicode/timezone.h unicode/tmunit.h unicode/tmutamt.h unicode/tmutfmt.h unicode/translit.h unicode/tzrule.h unicode/tztrans.h unicode/ucal.h unicode/ucoleitr.h unicode/ucol.h unicode/ucsdet.h unicode/ucurr.h unicode/udat.h unicode/udatpg.h unicode/uldnames.h unicode/ulocdata.h unicode/umsg.h unicode/unirepl.h unicode/unum.h unicode/uregex.h unicode/usearch.h unicode/uspoof.h unicode/utmscale.h unicode/utrans.h unicode/vtzone.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icui18n.target.linux-mips.mk b/icui18n.target.linux-mips.mk
deleted file mode 100644
index b4acc0a..0000000
--- a/icui18n.target.linux-mips.mk
+++ /dev/null
@@ -1,190 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icui18n_gyp
-LOCAL_MODULE_STEM := icui18n
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icui18n_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icui18n shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/i18n --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target" unicode/basictz.h unicode/bmsearch.h unicode/bms.h unicode/calendar.h unicode/choicfmt.h unicode/coleitr.h unicode/colldata.h unicode/coll.h unicode/curramt.h unicode/currpinf.h unicode/currunit.h unicode/datefmt.h unicode/dcfmtsym.h unicode/decimfmt.h unicode/dtfmtsym.h unicode/dtitvfmt.h unicode/dtitvinf.h unicode/dtptngen.h unicode/dtrule.h unicode/fieldpos.h unicode/fmtable.h unicode/format.h unicode/fpositer.h unicode/gregocal.h unicode/locdspnm.h unicode/measfmt.h unicode/measunit.h unicode/measure.h unicode/msgfmt.h unicode/numfmt.h unicode/numsys.h unicode/plurfmt.h unicode/plurrule.h unicode/rbnf.h unicode/rbtz.h unicode/regex.h unicode/search.h unicode/selfmt.h unicode/simpletz.h unicode/smpdtfmt.h unicode/sortkey.h unicode/stsearch.h unicode/tblcoll.h unicode/timezone.h unicode/tmunit.h unicode/tmutamt.h unicode/tmutfmt.h unicode/translit.h unicode/tzrule.h unicode/tztrans.h unicode/ucal.h unicode/ucoleitr.h unicode/ucol.h unicode/ucsdet.h unicode/ucurr.h unicode/udat.h unicode/udatpg.h unicode/uldnames.h unicode/ulocdata.h unicode/umsg.h unicode/unirepl.h unicode/unum.h unicode/uregex.h unicode/usearch.h unicode/uspoof.h unicode/utmscale.h unicode/utrans.h unicode/vtzone.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icui18n.target.linux-x86.mk b/icui18n.target.linux-x86.mk
deleted file mode 100644
index b4acc0a..0000000
--- a/icui18n.target.linux-x86.mk
+++ /dev/null
@@ -1,190 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icui18n_gyp
-LOCAL_MODULE_STEM := icui18n
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icui18n_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icui18n shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/i18n --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target" unicode/basictz.h unicode/bmsearch.h unicode/bms.h unicode/calendar.h unicode/choicfmt.h unicode/coleitr.h unicode/colldata.h unicode/coll.h unicode/curramt.h unicode/currpinf.h unicode/currunit.h unicode/datefmt.h unicode/dcfmtsym.h unicode/decimfmt.h unicode/dtfmtsym.h unicode/dtitvfmt.h unicode/dtitvinf.h unicode/dtptngen.h unicode/dtrule.h unicode/fieldpos.h unicode/fmtable.h unicode/format.h unicode/fpositer.h unicode/gregocal.h unicode/locdspnm.h unicode/measfmt.h unicode/measunit.h unicode/measure.h unicode/msgfmt.h unicode/numfmt.h unicode/numsys.h unicode/plurfmt.h unicode/plurrule.h unicode/rbnf.h unicode/rbtz.h unicode/regex.h unicode/search.h unicode/selfmt.h unicode/simpletz.h unicode/smpdtfmt.h unicode/sortkey.h unicode/stsearch.h unicode/tblcoll.h unicode/timezone.h unicode/tmunit.h unicode/tmutamt.h unicode/tmutfmt.h unicode/translit.h unicode/tzrule.h unicode/tztrans.h unicode/ucal.h unicode/ucoleitr.h unicode/ucol.h unicode/ucsdet.h unicode/ucurr.h unicode/udat.h unicode/udatpg.h unicode/uldnames.h unicode/ulocdata.h unicode/umsg.h unicode/unirepl.h unicode/unum.h unicode/uregex.h unicode/usearch.h unicode/uspoof.h unicode/utmscale.h unicode/utrans.h unicode/vtzone.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icui18n.target.linux-x86_64.mk b/icui18n.target.linux-x86_64.mk
deleted file mode 100644
index b4acc0a..0000000
--- a/icui18n.target.linux-x86_64.mk
+++ /dev/null
@@ -1,190 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icui18n_gyp
-LOCAL_MODULE_STEM := icui18n
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icui18n_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icui18n shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/i18n --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target" unicode/basictz.h unicode/bmsearch.h unicode/bms.h unicode/calendar.h unicode/choicfmt.h unicode/coleitr.h unicode/colldata.h unicode/coll.h unicode/curramt.h unicode/currpinf.h unicode/currunit.h unicode/datefmt.h unicode/dcfmtsym.h unicode/decimfmt.h unicode/dtfmtsym.h unicode/dtitvfmt.h unicode/dtitvinf.h unicode/dtptngen.h unicode/dtrule.h unicode/fieldpos.h unicode/fmtable.h unicode/format.h unicode/fpositer.h unicode/gregocal.h unicode/locdspnm.h unicode/measfmt.h unicode/measunit.h unicode/measure.h unicode/msgfmt.h unicode/numfmt.h unicode/numsys.h unicode/plurfmt.h unicode/plurrule.h unicode/rbnf.h unicode/rbtz.h unicode/regex.h unicode/search.h unicode/selfmt.h unicode/simpletz.h unicode/smpdtfmt.h unicode/sortkey.h unicode/stsearch.h unicode/tblcoll.h unicode/timezone.h unicode/tmunit.h unicode/tmutamt.h unicode/tmutfmt.h unicode/translit.h unicode/tzrule.h unicode/tztrans.h unicode/ucal.h unicode/ucoleitr.h unicode/ucol.h unicode/ucsdet.h unicode/ucurr.h unicode/udat.h unicode/udatpg.h unicode/uldnames.h unicode/ulocdata.h unicode/umsg.h unicode/unirepl.h unicode/unum.h unicode/uregex.h unicode/usearch.h unicode/uspoof.h unicode/utmscale.h unicode/utrans.h unicode/vtzone.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h: $(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/basictz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bmsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/bms.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/calendar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/choicfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/colldata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/coll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/curramt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currpinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/currunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/datefmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dcfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/decimfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtfmtsym.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtitvinf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtptngen.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/dtrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fieldpos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fmtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/format.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/fpositer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/gregocal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/locdspnm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/measure.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/msgfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/numsys.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/plurrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbnf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/rbtz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/regex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/search.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/selfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/simpletz.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/smpdtfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/sortkey.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/stsearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tblcoll.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/timezone.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmunit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutamt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tmutfmt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/translit.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tzrule.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/tztrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucoleitr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucol.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucsdet.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ucurr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/udatpg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uldnames.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/ulocdata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/umsg.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unirepl.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/unum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uregex.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/usearch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/uspoof.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utmscale.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/utrans.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icui18n/target/third_party/icu/source/i18n/unicode/vtzone.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icui18n_gyp
-
-# Alias gyp target name.
-.PHONY: icui18n
-icui18n: third_party_icu_icui18n_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icuuc.host.darwin-arm.mk b/icuuc.host.darwin-arm.mk
deleted file mode 100644
index 1172da1..0000000
--- a/icuuc.host.darwin-arm.mk
+++ /dev/null
@@ -1,367 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/common/bmpset.cpp \
-	third_party/icu/source/common/brkeng.cpp \
-	third_party/icu/source/common/brkiter.cpp \
-	third_party/icu/source/common/bytestream.cpp \
-	third_party/icu/source/common/caniter.cpp \
-	third_party/icu/source/common/chariter.cpp \
-	third_party/icu/source/common/charstr.cpp \
-	third_party/icu/source/common/cmemory.c \
-	third_party/icu/source/common/cstring.c \
-	third_party/icu/source/common/cwchar.c \
-	third_party/icu/source/common/dictbe.cpp \
-	third_party/icu/source/common/dtintrv.cpp \
-	third_party/icu/source/common/errorcode.cpp \
-	third_party/icu/source/common/filterednormalizer2.cpp \
-	third_party/icu/source/common/icudataver.c \
-	third_party/icu/source/common/icuplug.c \
-	third_party/icu/source/common/locavailable.cpp \
-	third_party/icu/source/common/locbased.cpp \
-	third_party/icu/source/common/locdispnames.cpp \
-	third_party/icu/source/common/locid.cpp \
-	third_party/icu/source/common/loclikely.cpp \
-	third_party/icu/source/common/locmap.c \
-	third_party/icu/source/common/locresdata.cpp \
-	third_party/icu/source/common/locutil.cpp \
-	third_party/icu/source/common/mutex.cpp \
-	third_party/icu/source/common/normalizer2.cpp \
-	third_party/icu/source/common/normalizer2impl.cpp \
-	third_party/icu/source/common/normlzr.cpp \
-	third_party/icu/source/common/parsepos.cpp \
-	third_party/icu/source/common/propname.cpp \
-	third_party/icu/source/common/propsvec.c \
-	third_party/icu/source/common/punycode.c \
-	third_party/icu/source/common/putil.c \
-	third_party/icu/source/common/rbbi.cpp \
-	third_party/icu/source/common/rbbidata.cpp \
-	third_party/icu/source/common/rbbinode.cpp \
-	third_party/icu/source/common/rbbirb.cpp \
-	third_party/icu/source/common/rbbiscan.cpp \
-	third_party/icu/source/common/rbbisetb.cpp \
-	third_party/icu/source/common/rbbistbl.cpp \
-	third_party/icu/source/common/rbbitblb.cpp \
-	third_party/icu/source/common/resbund.cpp \
-	third_party/icu/source/common/resbund_cnv.cpp \
-	third_party/icu/source/common/ruleiter.cpp \
-	third_party/icu/source/common/schriter.cpp \
-	third_party/icu/source/common/serv.cpp \
-	third_party/icu/source/common/servlk.cpp \
-	third_party/icu/source/common/servlkf.cpp \
-	third_party/icu/source/common/servls.cpp \
-	third_party/icu/source/common/servnotf.cpp \
-	third_party/icu/source/common/servrbf.cpp \
-	third_party/icu/source/common/servslkf.cpp \
-	third_party/icu/source/common/stringpiece.cpp \
-	third_party/icu/source/common/triedict.cpp \
-	third_party/icu/source/common/uarrsort.c \
-	third_party/icu/source/common/ubidi.c \
-	third_party/icu/source/common/ubidi_props.c \
-	third_party/icu/source/common/ubidiln.c \
-	third_party/icu/source/common/ubidiwrt.c \
-	third_party/icu/source/common/ubrk.cpp \
-	third_party/icu/source/common/ucase.c \
-	third_party/icu/source/common/ucasemap.c \
-	third_party/icu/source/common/ucat.c \
-	third_party/icu/source/common/uchar.c \
-	third_party/icu/source/common/uchriter.cpp \
-	third_party/icu/source/common/ucln_cmn.c \
-	third_party/icu/source/common/ucmndata.c \
-	third_party/icu/source/common/ucnv.c \
-	third_party/icu/source/common/ucnv2022.c \
-	third_party/icu/source/common/ucnv_bld.c \
-	third_party/icu/source/common/ucnv_cb.c \
-	third_party/icu/source/common/ucnv_cnv.c \
-	third_party/icu/source/common/ucnv_err.c \
-	third_party/icu/source/common/ucnv_ext.c \
-	third_party/icu/source/common/ucnv_io.c \
-	third_party/icu/source/common/ucnv_lmb.c \
-	third_party/icu/source/common/ucnv_set.c \
-	third_party/icu/source/common/ucnv_u16.c \
-	third_party/icu/source/common/ucnv_u32.c \
-	third_party/icu/source/common/ucnv_u7.c \
-	third_party/icu/source/common/ucnv_u8.c \
-	third_party/icu/source/common/ucnvbocu.c \
-	third_party/icu/source/common/ucnvdisp.c \
-	third_party/icu/source/common/ucnvhz.c \
-	third_party/icu/source/common/ucnvisci.c \
-	third_party/icu/source/common/ucnvlat1.c \
-	third_party/icu/source/common/ucnvmbcs.c \
-	third_party/icu/source/common/ucnvscsu.c \
-	third_party/icu/source/common/ucnvsel.cpp \
-	third_party/icu/source/common/ucol_swp.cpp \
-	third_party/icu/source/common/udata.cpp \
-	third_party/icu/source/common/udatamem.c \
-	third_party/icu/source/common/udataswp.c \
-	third_party/icu/source/common/uenum.c \
-	third_party/icu/source/common/uhash.c \
-	third_party/icu/source/common/uhash_us.cpp \
-	third_party/icu/source/common/uidna.cpp \
-	third_party/icu/source/common/uinit.c \
-	third_party/icu/source/common/uinvchar.c \
-	third_party/icu/source/common/uiter.cpp \
-	third_party/icu/source/common/ulist.c \
-	third_party/icu/source/common/uloc.c \
-	third_party/icu/source/common/uloc_tag.c \
-	third_party/icu/source/common/umapfile.c \
-	third_party/icu/source/common/umath.c \
-	third_party/icu/source/common/umutex.c \
-	third_party/icu/source/common/unames.c \
-	third_party/icu/source/common/unifilt.cpp \
-	third_party/icu/source/common/unifunct.cpp \
-	third_party/icu/source/common/uniset.cpp \
-	third_party/icu/source/common/uniset_props.cpp \
-	third_party/icu/source/common/unisetspan.cpp \
-	third_party/icu/source/common/unistr.cpp \
-	third_party/icu/source/common/unistr_case.cpp \
-	third_party/icu/source/common/unistr_cnv.cpp \
-	third_party/icu/source/common/unistr_props.cpp \
-	third_party/icu/source/common/unorm.cpp \
-	third_party/icu/source/common/unorm_it.c \
-	third_party/icu/source/common/unormcmp.cpp \
-	third_party/icu/source/common/uobject.cpp \
-	third_party/icu/source/common/uprops.cpp \
-	third_party/icu/source/common/ures_cnv.c \
-	third_party/icu/source/common/uresbund.c \
-	third_party/icu/source/common/uresdata.c \
-	third_party/icu/source/common/usc_impl.c \
-	third_party/icu/source/common/uscript.c \
-	third_party/icu/source/common/uset.cpp \
-	third_party/icu/source/common/uset_props.cpp \
-	third_party/icu/source/common/usetiter.cpp \
-	third_party/icu/source/common/ushape.c \
-	third_party/icu/source/common/usprep.cpp \
-	third_party/icu/source/common/ustack.cpp \
-	third_party/icu/source/common/ustr_cnv.c \
-	third_party/icu/source/common/ustr_wcs.c \
-	third_party/icu/source/common/ustrcase.c \
-	third_party/icu/source/common/ustrenum.cpp \
-	third_party/icu/source/common/ustrfmt.c \
-	third_party/icu/source/common/ustring.c \
-	third_party/icu/source/common/ustrtrns.c \
-	third_party/icu/source/common/utext.cpp \
-	third_party/icu/source/common/utf_impl.c \
-	third_party/icu/source/common/util.cpp \
-	third_party/icu/source/common/util_props.cpp \
-	third_party/icu/source/common/utrace.c \
-	third_party/icu/source/common/utrie.c \
-	third_party/icu/source/common/utrie2.cpp \
-	third_party/icu/source/common/utrie2_builder.c \
-	third_party/icu/source/common/uts46.cpp \
-	third_party/icu/source/common/utypes.c \
-	third_party/icu/source/common/uvector.cpp \
-	third_party/icu/source/common/uvectr32.cpp \
-	third_party/icu/source/common/uvectr64.cpp \
-	third_party/icu/source/common/wintz.c
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icuuc.host.darwin-arm64.mk b/icuuc.host.darwin-arm64.mk
deleted file mode 100644
index cfe1412..0000000
--- a/icuuc.host.darwin-arm64.mk
+++ /dev/null
@@ -1,367 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/common/bmpset.cpp \
-	third_party/icu/source/common/brkeng.cpp \
-	third_party/icu/source/common/brkiter.cpp \
-	third_party/icu/source/common/bytestream.cpp \
-	third_party/icu/source/common/caniter.cpp \
-	third_party/icu/source/common/chariter.cpp \
-	third_party/icu/source/common/charstr.cpp \
-	third_party/icu/source/common/cmemory.c \
-	third_party/icu/source/common/cstring.c \
-	third_party/icu/source/common/cwchar.c \
-	third_party/icu/source/common/dictbe.cpp \
-	third_party/icu/source/common/dtintrv.cpp \
-	third_party/icu/source/common/errorcode.cpp \
-	third_party/icu/source/common/filterednormalizer2.cpp \
-	third_party/icu/source/common/icudataver.c \
-	third_party/icu/source/common/icuplug.c \
-	third_party/icu/source/common/locavailable.cpp \
-	third_party/icu/source/common/locbased.cpp \
-	third_party/icu/source/common/locdispnames.cpp \
-	third_party/icu/source/common/locid.cpp \
-	third_party/icu/source/common/loclikely.cpp \
-	third_party/icu/source/common/locmap.c \
-	third_party/icu/source/common/locresdata.cpp \
-	third_party/icu/source/common/locutil.cpp \
-	third_party/icu/source/common/mutex.cpp \
-	third_party/icu/source/common/normalizer2.cpp \
-	third_party/icu/source/common/normalizer2impl.cpp \
-	third_party/icu/source/common/normlzr.cpp \
-	third_party/icu/source/common/parsepos.cpp \
-	third_party/icu/source/common/propname.cpp \
-	third_party/icu/source/common/propsvec.c \
-	third_party/icu/source/common/punycode.c \
-	third_party/icu/source/common/putil.c \
-	third_party/icu/source/common/rbbi.cpp \
-	third_party/icu/source/common/rbbidata.cpp \
-	third_party/icu/source/common/rbbinode.cpp \
-	third_party/icu/source/common/rbbirb.cpp \
-	third_party/icu/source/common/rbbiscan.cpp \
-	third_party/icu/source/common/rbbisetb.cpp \
-	third_party/icu/source/common/rbbistbl.cpp \
-	third_party/icu/source/common/rbbitblb.cpp \
-	third_party/icu/source/common/resbund.cpp \
-	third_party/icu/source/common/resbund_cnv.cpp \
-	third_party/icu/source/common/ruleiter.cpp \
-	third_party/icu/source/common/schriter.cpp \
-	third_party/icu/source/common/serv.cpp \
-	third_party/icu/source/common/servlk.cpp \
-	third_party/icu/source/common/servlkf.cpp \
-	third_party/icu/source/common/servls.cpp \
-	third_party/icu/source/common/servnotf.cpp \
-	third_party/icu/source/common/servrbf.cpp \
-	third_party/icu/source/common/servslkf.cpp \
-	third_party/icu/source/common/stringpiece.cpp \
-	third_party/icu/source/common/triedict.cpp \
-	third_party/icu/source/common/uarrsort.c \
-	third_party/icu/source/common/ubidi.c \
-	third_party/icu/source/common/ubidi_props.c \
-	third_party/icu/source/common/ubidiln.c \
-	third_party/icu/source/common/ubidiwrt.c \
-	third_party/icu/source/common/ubrk.cpp \
-	third_party/icu/source/common/ucase.c \
-	third_party/icu/source/common/ucasemap.c \
-	third_party/icu/source/common/ucat.c \
-	third_party/icu/source/common/uchar.c \
-	third_party/icu/source/common/uchriter.cpp \
-	third_party/icu/source/common/ucln_cmn.c \
-	third_party/icu/source/common/ucmndata.c \
-	third_party/icu/source/common/ucnv.c \
-	third_party/icu/source/common/ucnv2022.c \
-	third_party/icu/source/common/ucnv_bld.c \
-	third_party/icu/source/common/ucnv_cb.c \
-	third_party/icu/source/common/ucnv_cnv.c \
-	third_party/icu/source/common/ucnv_err.c \
-	third_party/icu/source/common/ucnv_ext.c \
-	third_party/icu/source/common/ucnv_io.c \
-	third_party/icu/source/common/ucnv_lmb.c \
-	third_party/icu/source/common/ucnv_set.c \
-	third_party/icu/source/common/ucnv_u16.c \
-	third_party/icu/source/common/ucnv_u32.c \
-	third_party/icu/source/common/ucnv_u7.c \
-	third_party/icu/source/common/ucnv_u8.c \
-	third_party/icu/source/common/ucnvbocu.c \
-	third_party/icu/source/common/ucnvdisp.c \
-	third_party/icu/source/common/ucnvhz.c \
-	third_party/icu/source/common/ucnvisci.c \
-	third_party/icu/source/common/ucnvlat1.c \
-	third_party/icu/source/common/ucnvmbcs.c \
-	third_party/icu/source/common/ucnvscsu.c \
-	third_party/icu/source/common/ucnvsel.cpp \
-	third_party/icu/source/common/ucol_swp.cpp \
-	third_party/icu/source/common/udata.cpp \
-	third_party/icu/source/common/udatamem.c \
-	third_party/icu/source/common/udataswp.c \
-	third_party/icu/source/common/uenum.c \
-	third_party/icu/source/common/uhash.c \
-	third_party/icu/source/common/uhash_us.cpp \
-	third_party/icu/source/common/uidna.cpp \
-	third_party/icu/source/common/uinit.c \
-	third_party/icu/source/common/uinvchar.c \
-	third_party/icu/source/common/uiter.cpp \
-	third_party/icu/source/common/ulist.c \
-	third_party/icu/source/common/uloc.c \
-	third_party/icu/source/common/uloc_tag.c \
-	third_party/icu/source/common/umapfile.c \
-	third_party/icu/source/common/umath.c \
-	third_party/icu/source/common/umutex.c \
-	third_party/icu/source/common/unames.c \
-	third_party/icu/source/common/unifilt.cpp \
-	third_party/icu/source/common/unifunct.cpp \
-	third_party/icu/source/common/uniset.cpp \
-	third_party/icu/source/common/uniset_props.cpp \
-	third_party/icu/source/common/unisetspan.cpp \
-	third_party/icu/source/common/unistr.cpp \
-	third_party/icu/source/common/unistr_case.cpp \
-	third_party/icu/source/common/unistr_cnv.cpp \
-	third_party/icu/source/common/unistr_props.cpp \
-	third_party/icu/source/common/unorm.cpp \
-	third_party/icu/source/common/unorm_it.c \
-	third_party/icu/source/common/unormcmp.cpp \
-	third_party/icu/source/common/uobject.cpp \
-	third_party/icu/source/common/uprops.cpp \
-	third_party/icu/source/common/ures_cnv.c \
-	third_party/icu/source/common/uresbund.c \
-	third_party/icu/source/common/uresdata.c \
-	third_party/icu/source/common/usc_impl.c \
-	third_party/icu/source/common/uscript.c \
-	third_party/icu/source/common/uset.cpp \
-	third_party/icu/source/common/uset_props.cpp \
-	third_party/icu/source/common/usetiter.cpp \
-	third_party/icu/source/common/ushape.c \
-	third_party/icu/source/common/usprep.cpp \
-	third_party/icu/source/common/ustack.cpp \
-	third_party/icu/source/common/ustr_cnv.c \
-	third_party/icu/source/common/ustr_wcs.c \
-	third_party/icu/source/common/ustrcase.c \
-	third_party/icu/source/common/ustrenum.cpp \
-	third_party/icu/source/common/ustrfmt.c \
-	third_party/icu/source/common/ustring.c \
-	third_party/icu/source/common/ustrtrns.c \
-	third_party/icu/source/common/utext.cpp \
-	third_party/icu/source/common/utf_impl.c \
-	third_party/icu/source/common/util.cpp \
-	third_party/icu/source/common/util_props.cpp \
-	third_party/icu/source/common/utrace.c \
-	third_party/icu/source/common/utrie.c \
-	third_party/icu/source/common/utrie2.cpp \
-	third_party/icu/source/common/utrie2_builder.c \
-	third_party/icu/source/common/uts46.cpp \
-	third_party/icu/source/common/utypes.c \
-	third_party/icu/source/common/uvector.cpp \
-	third_party/icu/source/common/uvectr32.cpp \
-	third_party/icu/source/common/uvectr64.cpp \
-	third_party/icu/source/common/wintz.c
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icuuc.host.darwin-mips.mk b/icuuc.host.darwin-mips.mk
deleted file mode 100644
index f69097e..0000000
--- a/icuuc.host.darwin-mips.mk
+++ /dev/null
@@ -1,369 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/common/bmpset.cpp \
-	third_party/icu/source/common/brkeng.cpp \
-	third_party/icu/source/common/brkiter.cpp \
-	third_party/icu/source/common/bytestream.cpp \
-	third_party/icu/source/common/caniter.cpp \
-	third_party/icu/source/common/chariter.cpp \
-	third_party/icu/source/common/charstr.cpp \
-	third_party/icu/source/common/cmemory.c \
-	third_party/icu/source/common/cstring.c \
-	third_party/icu/source/common/cwchar.c \
-	third_party/icu/source/common/dictbe.cpp \
-	third_party/icu/source/common/dtintrv.cpp \
-	third_party/icu/source/common/errorcode.cpp \
-	third_party/icu/source/common/filterednormalizer2.cpp \
-	third_party/icu/source/common/icudataver.c \
-	third_party/icu/source/common/icuplug.c \
-	third_party/icu/source/common/locavailable.cpp \
-	third_party/icu/source/common/locbased.cpp \
-	third_party/icu/source/common/locdispnames.cpp \
-	third_party/icu/source/common/locid.cpp \
-	third_party/icu/source/common/loclikely.cpp \
-	third_party/icu/source/common/locmap.c \
-	third_party/icu/source/common/locresdata.cpp \
-	third_party/icu/source/common/locutil.cpp \
-	third_party/icu/source/common/mutex.cpp \
-	third_party/icu/source/common/normalizer2.cpp \
-	third_party/icu/source/common/normalizer2impl.cpp \
-	third_party/icu/source/common/normlzr.cpp \
-	third_party/icu/source/common/parsepos.cpp \
-	third_party/icu/source/common/propname.cpp \
-	third_party/icu/source/common/propsvec.c \
-	third_party/icu/source/common/punycode.c \
-	third_party/icu/source/common/putil.c \
-	third_party/icu/source/common/rbbi.cpp \
-	third_party/icu/source/common/rbbidata.cpp \
-	third_party/icu/source/common/rbbinode.cpp \
-	third_party/icu/source/common/rbbirb.cpp \
-	third_party/icu/source/common/rbbiscan.cpp \
-	third_party/icu/source/common/rbbisetb.cpp \
-	third_party/icu/source/common/rbbistbl.cpp \
-	third_party/icu/source/common/rbbitblb.cpp \
-	third_party/icu/source/common/resbund.cpp \
-	third_party/icu/source/common/resbund_cnv.cpp \
-	third_party/icu/source/common/ruleiter.cpp \
-	third_party/icu/source/common/schriter.cpp \
-	third_party/icu/source/common/serv.cpp \
-	third_party/icu/source/common/servlk.cpp \
-	third_party/icu/source/common/servlkf.cpp \
-	third_party/icu/source/common/servls.cpp \
-	third_party/icu/source/common/servnotf.cpp \
-	third_party/icu/source/common/servrbf.cpp \
-	third_party/icu/source/common/servslkf.cpp \
-	third_party/icu/source/common/stringpiece.cpp \
-	third_party/icu/source/common/triedict.cpp \
-	third_party/icu/source/common/uarrsort.c \
-	third_party/icu/source/common/ubidi.c \
-	third_party/icu/source/common/ubidi_props.c \
-	third_party/icu/source/common/ubidiln.c \
-	third_party/icu/source/common/ubidiwrt.c \
-	third_party/icu/source/common/ubrk.cpp \
-	third_party/icu/source/common/ucase.c \
-	third_party/icu/source/common/ucasemap.c \
-	third_party/icu/source/common/ucat.c \
-	third_party/icu/source/common/uchar.c \
-	third_party/icu/source/common/uchriter.cpp \
-	third_party/icu/source/common/ucln_cmn.c \
-	third_party/icu/source/common/ucmndata.c \
-	third_party/icu/source/common/ucnv.c \
-	third_party/icu/source/common/ucnv2022.c \
-	third_party/icu/source/common/ucnv_bld.c \
-	third_party/icu/source/common/ucnv_cb.c \
-	third_party/icu/source/common/ucnv_cnv.c \
-	third_party/icu/source/common/ucnv_err.c \
-	third_party/icu/source/common/ucnv_ext.c \
-	third_party/icu/source/common/ucnv_io.c \
-	third_party/icu/source/common/ucnv_lmb.c \
-	third_party/icu/source/common/ucnv_set.c \
-	third_party/icu/source/common/ucnv_u16.c \
-	third_party/icu/source/common/ucnv_u32.c \
-	third_party/icu/source/common/ucnv_u7.c \
-	third_party/icu/source/common/ucnv_u8.c \
-	third_party/icu/source/common/ucnvbocu.c \
-	third_party/icu/source/common/ucnvdisp.c \
-	third_party/icu/source/common/ucnvhz.c \
-	third_party/icu/source/common/ucnvisci.c \
-	third_party/icu/source/common/ucnvlat1.c \
-	third_party/icu/source/common/ucnvmbcs.c \
-	third_party/icu/source/common/ucnvscsu.c \
-	third_party/icu/source/common/ucnvsel.cpp \
-	third_party/icu/source/common/ucol_swp.cpp \
-	third_party/icu/source/common/udata.cpp \
-	third_party/icu/source/common/udatamem.c \
-	third_party/icu/source/common/udataswp.c \
-	third_party/icu/source/common/uenum.c \
-	third_party/icu/source/common/uhash.c \
-	third_party/icu/source/common/uhash_us.cpp \
-	third_party/icu/source/common/uidna.cpp \
-	third_party/icu/source/common/uinit.c \
-	third_party/icu/source/common/uinvchar.c \
-	third_party/icu/source/common/uiter.cpp \
-	third_party/icu/source/common/ulist.c \
-	third_party/icu/source/common/uloc.c \
-	third_party/icu/source/common/uloc_tag.c \
-	third_party/icu/source/common/umapfile.c \
-	third_party/icu/source/common/umath.c \
-	third_party/icu/source/common/umutex.c \
-	third_party/icu/source/common/unames.c \
-	third_party/icu/source/common/unifilt.cpp \
-	third_party/icu/source/common/unifunct.cpp \
-	third_party/icu/source/common/uniset.cpp \
-	third_party/icu/source/common/uniset_props.cpp \
-	third_party/icu/source/common/unisetspan.cpp \
-	third_party/icu/source/common/unistr.cpp \
-	third_party/icu/source/common/unistr_case.cpp \
-	third_party/icu/source/common/unistr_cnv.cpp \
-	third_party/icu/source/common/unistr_props.cpp \
-	third_party/icu/source/common/unorm.cpp \
-	third_party/icu/source/common/unorm_it.c \
-	third_party/icu/source/common/unormcmp.cpp \
-	third_party/icu/source/common/uobject.cpp \
-	third_party/icu/source/common/uprops.cpp \
-	third_party/icu/source/common/ures_cnv.c \
-	third_party/icu/source/common/uresbund.c \
-	third_party/icu/source/common/uresdata.c \
-	third_party/icu/source/common/usc_impl.c \
-	third_party/icu/source/common/uscript.c \
-	third_party/icu/source/common/uset.cpp \
-	third_party/icu/source/common/uset_props.cpp \
-	third_party/icu/source/common/usetiter.cpp \
-	third_party/icu/source/common/ushape.c \
-	third_party/icu/source/common/usprep.cpp \
-	third_party/icu/source/common/ustack.cpp \
-	third_party/icu/source/common/ustr_cnv.c \
-	third_party/icu/source/common/ustr_wcs.c \
-	third_party/icu/source/common/ustrcase.c \
-	third_party/icu/source/common/ustrenum.cpp \
-	third_party/icu/source/common/ustrfmt.c \
-	third_party/icu/source/common/ustring.c \
-	third_party/icu/source/common/ustrtrns.c \
-	third_party/icu/source/common/utext.cpp \
-	third_party/icu/source/common/utf_impl.c \
-	third_party/icu/source/common/util.cpp \
-	third_party/icu/source/common/util_props.cpp \
-	third_party/icu/source/common/utrace.c \
-	third_party/icu/source/common/utrie.c \
-	third_party/icu/source/common/utrie2.cpp \
-	third_party/icu/source/common/utrie2_builder.c \
-	third_party/icu/source/common/uts46.cpp \
-	third_party/icu/source/common/utypes.c \
-	third_party/icu/source/common/uvector.cpp \
-	third_party/icu/source/common/uvectr32.cpp \
-	third_party/icu/source/common/uvectr64.cpp \
-	third_party/icu/source/common/wintz.c
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icuuc.host.darwin-x86.mk b/icuuc.host.darwin-x86.mk
deleted file mode 100644
index 1172da1..0000000
--- a/icuuc.host.darwin-x86.mk
+++ /dev/null
@@ -1,367 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/common/bmpset.cpp \
-	third_party/icu/source/common/brkeng.cpp \
-	third_party/icu/source/common/brkiter.cpp \
-	third_party/icu/source/common/bytestream.cpp \
-	third_party/icu/source/common/caniter.cpp \
-	third_party/icu/source/common/chariter.cpp \
-	third_party/icu/source/common/charstr.cpp \
-	third_party/icu/source/common/cmemory.c \
-	third_party/icu/source/common/cstring.c \
-	third_party/icu/source/common/cwchar.c \
-	third_party/icu/source/common/dictbe.cpp \
-	third_party/icu/source/common/dtintrv.cpp \
-	third_party/icu/source/common/errorcode.cpp \
-	third_party/icu/source/common/filterednormalizer2.cpp \
-	third_party/icu/source/common/icudataver.c \
-	third_party/icu/source/common/icuplug.c \
-	third_party/icu/source/common/locavailable.cpp \
-	third_party/icu/source/common/locbased.cpp \
-	third_party/icu/source/common/locdispnames.cpp \
-	third_party/icu/source/common/locid.cpp \
-	third_party/icu/source/common/loclikely.cpp \
-	third_party/icu/source/common/locmap.c \
-	third_party/icu/source/common/locresdata.cpp \
-	third_party/icu/source/common/locutil.cpp \
-	third_party/icu/source/common/mutex.cpp \
-	third_party/icu/source/common/normalizer2.cpp \
-	third_party/icu/source/common/normalizer2impl.cpp \
-	third_party/icu/source/common/normlzr.cpp \
-	third_party/icu/source/common/parsepos.cpp \
-	third_party/icu/source/common/propname.cpp \
-	third_party/icu/source/common/propsvec.c \
-	third_party/icu/source/common/punycode.c \
-	third_party/icu/source/common/putil.c \
-	third_party/icu/source/common/rbbi.cpp \
-	third_party/icu/source/common/rbbidata.cpp \
-	third_party/icu/source/common/rbbinode.cpp \
-	third_party/icu/source/common/rbbirb.cpp \
-	third_party/icu/source/common/rbbiscan.cpp \
-	third_party/icu/source/common/rbbisetb.cpp \
-	third_party/icu/source/common/rbbistbl.cpp \
-	third_party/icu/source/common/rbbitblb.cpp \
-	third_party/icu/source/common/resbund.cpp \
-	third_party/icu/source/common/resbund_cnv.cpp \
-	third_party/icu/source/common/ruleiter.cpp \
-	third_party/icu/source/common/schriter.cpp \
-	third_party/icu/source/common/serv.cpp \
-	third_party/icu/source/common/servlk.cpp \
-	third_party/icu/source/common/servlkf.cpp \
-	third_party/icu/source/common/servls.cpp \
-	third_party/icu/source/common/servnotf.cpp \
-	third_party/icu/source/common/servrbf.cpp \
-	third_party/icu/source/common/servslkf.cpp \
-	third_party/icu/source/common/stringpiece.cpp \
-	third_party/icu/source/common/triedict.cpp \
-	third_party/icu/source/common/uarrsort.c \
-	third_party/icu/source/common/ubidi.c \
-	third_party/icu/source/common/ubidi_props.c \
-	third_party/icu/source/common/ubidiln.c \
-	third_party/icu/source/common/ubidiwrt.c \
-	third_party/icu/source/common/ubrk.cpp \
-	third_party/icu/source/common/ucase.c \
-	third_party/icu/source/common/ucasemap.c \
-	third_party/icu/source/common/ucat.c \
-	third_party/icu/source/common/uchar.c \
-	third_party/icu/source/common/uchriter.cpp \
-	third_party/icu/source/common/ucln_cmn.c \
-	third_party/icu/source/common/ucmndata.c \
-	third_party/icu/source/common/ucnv.c \
-	third_party/icu/source/common/ucnv2022.c \
-	third_party/icu/source/common/ucnv_bld.c \
-	third_party/icu/source/common/ucnv_cb.c \
-	third_party/icu/source/common/ucnv_cnv.c \
-	third_party/icu/source/common/ucnv_err.c \
-	third_party/icu/source/common/ucnv_ext.c \
-	third_party/icu/source/common/ucnv_io.c \
-	third_party/icu/source/common/ucnv_lmb.c \
-	third_party/icu/source/common/ucnv_set.c \
-	third_party/icu/source/common/ucnv_u16.c \
-	third_party/icu/source/common/ucnv_u32.c \
-	third_party/icu/source/common/ucnv_u7.c \
-	third_party/icu/source/common/ucnv_u8.c \
-	third_party/icu/source/common/ucnvbocu.c \
-	third_party/icu/source/common/ucnvdisp.c \
-	third_party/icu/source/common/ucnvhz.c \
-	third_party/icu/source/common/ucnvisci.c \
-	third_party/icu/source/common/ucnvlat1.c \
-	third_party/icu/source/common/ucnvmbcs.c \
-	third_party/icu/source/common/ucnvscsu.c \
-	third_party/icu/source/common/ucnvsel.cpp \
-	third_party/icu/source/common/ucol_swp.cpp \
-	third_party/icu/source/common/udata.cpp \
-	third_party/icu/source/common/udatamem.c \
-	third_party/icu/source/common/udataswp.c \
-	third_party/icu/source/common/uenum.c \
-	third_party/icu/source/common/uhash.c \
-	third_party/icu/source/common/uhash_us.cpp \
-	third_party/icu/source/common/uidna.cpp \
-	third_party/icu/source/common/uinit.c \
-	third_party/icu/source/common/uinvchar.c \
-	third_party/icu/source/common/uiter.cpp \
-	third_party/icu/source/common/ulist.c \
-	third_party/icu/source/common/uloc.c \
-	third_party/icu/source/common/uloc_tag.c \
-	third_party/icu/source/common/umapfile.c \
-	third_party/icu/source/common/umath.c \
-	third_party/icu/source/common/umutex.c \
-	third_party/icu/source/common/unames.c \
-	third_party/icu/source/common/unifilt.cpp \
-	third_party/icu/source/common/unifunct.cpp \
-	third_party/icu/source/common/uniset.cpp \
-	third_party/icu/source/common/uniset_props.cpp \
-	third_party/icu/source/common/unisetspan.cpp \
-	third_party/icu/source/common/unistr.cpp \
-	third_party/icu/source/common/unistr_case.cpp \
-	third_party/icu/source/common/unistr_cnv.cpp \
-	third_party/icu/source/common/unistr_props.cpp \
-	third_party/icu/source/common/unorm.cpp \
-	third_party/icu/source/common/unorm_it.c \
-	third_party/icu/source/common/unormcmp.cpp \
-	third_party/icu/source/common/uobject.cpp \
-	third_party/icu/source/common/uprops.cpp \
-	third_party/icu/source/common/ures_cnv.c \
-	third_party/icu/source/common/uresbund.c \
-	third_party/icu/source/common/uresdata.c \
-	third_party/icu/source/common/usc_impl.c \
-	third_party/icu/source/common/uscript.c \
-	third_party/icu/source/common/uset.cpp \
-	third_party/icu/source/common/uset_props.cpp \
-	third_party/icu/source/common/usetiter.cpp \
-	third_party/icu/source/common/ushape.c \
-	third_party/icu/source/common/usprep.cpp \
-	third_party/icu/source/common/ustack.cpp \
-	third_party/icu/source/common/ustr_cnv.c \
-	third_party/icu/source/common/ustr_wcs.c \
-	third_party/icu/source/common/ustrcase.c \
-	third_party/icu/source/common/ustrenum.cpp \
-	third_party/icu/source/common/ustrfmt.c \
-	third_party/icu/source/common/ustring.c \
-	third_party/icu/source/common/ustrtrns.c \
-	third_party/icu/source/common/utext.cpp \
-	third_party/icu/source/common/utf_impl.c \
-	third_party/icu/source/common/util.cpp \
-	third_party/icu/source/common/util_props.cpp \
-	third_party/icu/source/common/utrace.c \
-	third_party/icu/source/common/utrie.c \
-	third_party/icu/source/common/utrie2.cpp \
-	third_party/icu/source/common/utrie2_builder.c \
-	third_party/icu/source/common/uts46.cpp \
-	third_party/icu/source/common/utypes.c \
-	third_party/icu/source/common/uvector.cpp \
-	third_party/icu/source/common/uvectr32.cpp \
-	third_party/icu/source/common/uvectr64.cpp \
-	third_party/icu/source/common/wintz.c
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icuuc.host.darwin-x86_64.mk b/icuuc.host.darwin-x86_64.mk
deleted file mode 100644
index cfe1412..0000000
--- a/icuuc.host.darwin-x86_64.mk
+++ /dev/null
@@ -1,367 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/common/bmpset.cpp \
-	third_party/icu/source/common/brkeng.cpp \
-	third_party/icu/source/common/brkiter.cpp \
-	third_party/icu/source/common/bytestream.cpp \
-	third_party/icu/source/common/caniter.cpp \
-	third_party/icu/source/common/chariter.cpp \
-	third_party/icu/source/common/charstr.cpp \
-	third_party/icu/source/common/cmemory.c \
-	third_party/icu/source/common/cstring.c \
-	third_party/icu/source/common/cwchar.c \
-	third_party/icu/source/common/dictbe.cpp \
-	third_party/icu/source/common/dtintrv.cpp \
-	third_party/icu/source/common/errorcode.cpp \
-	third_party/icu/source/common/filterednormalizer2.cpp \
-	third_party/icu/source/common/icudataver.c \
-	third_party/icu/source/common/icuplug.c \
-	third_party/icu/source/common/locavailable.cpp \
-	third_party/icu/source/common/locbased.cpp \
-	third_party/icu/source/common/locdispnames.cpp \
-	third_party/icu/source/common/locid.cpp \
-	third_party/icu/source/common/loclikely.cpp \
-	third_party/icu/source/common/locmap.c \
-	third_party/icu/source/common/locresdata.cpp \
-	third_party/icu/source/common/locutil.cpp \
-	third_party/icu/source/common/mutex.cpp \
-	third_party/icu/source/common/normalizer2.cpp \
-	third_party/icu/source/common/normalizer2impl.cpp \
-	third_party/icu/source/common/normlzr.cpp \
-	third_party/icu/source/common/parsepos.cpp \
-	third_party/icu/source/common/propname.cpp \
-	third_party/icu/source/common/propsvec.c \
-	third_party/icu/source/common/punycode.c \
-	third_party/icu/source/common/putil.c \
-	third_party/icu/source/common/rbbi.cpp \
-	third_party/icu/source/common/rbbidata.cpp \
-	third_party/icu/source/common/rbbinode.cpp \
-	third_party/icu/source/common/rbbirb.cpp \
-	third_party/icu/source/common/rbbiscan.cpp \
-	third_party/icu/source/common/rbbisetb.cpp \
-	third_party/icu/source/common/rbbistbl.cpp \
-	third_party/icu/source/common/rbbitblb.cpp \
-	third_party/icu/source/common/resbund.cpp \
-	third_party/icu/source/common/resbund_cnv.cpp \
-	third_party/icu/source/common/ruleiter.cpp \
-	third_party/icu/source/common/schriter.cpp \
-	third_party/icu/source/common/serv.cpp \
-	third_party/icu/source/common/servlk.cpp \
-	third_party/icu/source/common/servlkf.cpp \
-	third_party/icu/source/common/servls.cpp \
-	third_party/icu/source/common/servnotf.cpp \
-	third_party/icu/source/common/servrbf.cpp \
-	third_party/icu/source/common/servslkf.cpp \
-	third_party/icu/source/common/stringpiece.cpp \
-	third_party/icu/source/common/triedict.cpp \
-	third_party/icu/source/common/uarrsort.c \
-	third_party/icu/source/common/ubidi.c \
-	third_party/icu/source/common/ubidi_props.c \
-	third_party/icu/source/common/ubidiln.c \
-	third_party/icu/source/common/ubidiwrt.c \
-	third_party/icu/source/common/ubrk.cpp \
-	third_party/icu/source/common/ucase.c \
-	third_party/icu/source/common/ucasemap.c \
-	third_party/icu/source/common/ucat.c \
-	third_party/icu/source/common/uchar.c \
-	third_party/icu/source/common/uchriter.cpp \
-	third_party/icu/source/common/ucln_cmn.c \
-	third_party/icu/source/common/ucmndata.c \
-	third_party/icu/source/common/ucnv.c \
-	third_party/icu/source/common/ucnv2022.c \
-	third_party/icu/source/common/ucnv_bld.c \
-	third_party/icu/source/common/ucnv_cb.c \
-	third_party/icu/source/common/ucnv_cnv.c \
-	third_party/icu/source/common/ucnv_err.c \
-	third_party/icu/source/common/ucnv_ext.c \
-	third_party/icu/source/common/ucnv_io.c \
-	third_party/icu/source/common/ucnv_lmb.c \
-	third_party/icu/source/common/ucnv_set.c \
-	third_party/icu/source/common/ucnv_u16.c \
-	third_party/icu/source/common/ucnv_u32.c \
-	third_party/icu/source/common/ucnv_u7.c \
-	third_party/icu/source/common/ucnv_u8.c \
-	third_party/icu/source/common/ucnvbocu.c \
-	third_party/icu/source/common/ucnvdisp.c \
-	third_party/icu/source/common/ucnvhz.c \
-	third_party/icu/source/common/ucnvisci.c \
-	third_party/icu/source/common/ucnvlat1.c \
-	third_party/icu/source/common/ucnvmbcs.c \
-	third_party/icu/source/common/ucnvscsu.c \
-	third_party/icu/source/common/ucnvsel.cpp \
-	third_party/icu/source/common/ucol_swp.cpp \
-	third_party/icu/source/common/udata.cpp \
-	third_party/icu/source/common/udatamem.c \
-	third_party/icu/source/common/udataswp.c \
-	third_party/icu/source/common/uenum.c \
-	third_party/icu/source/common/uhash.c \
-	third_party/icu/source/common/uhash_us.cpp \
-	third_party/icu/source/common/uidna.cpp \
-	third_party/icu/source/common/uinit.c \
-	third_party/icu/source/common/uinvchar.c \
-	third_party/icu/source/common/uiter.cpp \
-	third_party/icu/source/common/ulist.c \
-	third_party/icu/source/common/uloc.c \
-	third_party/icu/source/common/uloc_tag.c \
-	third_party/icu/source/common/umapfile.c \
-	third_party/icu/source/common/umath.c \
-	third_party/icu/source/common/umutex.c \
-	third_party/icu/source/common/unames.c \
-	third_party/icu/source/common/unifilt.cpp \
-	third_party/icu/source/common/unifunct.cpp \
-	third_party/icu/source/common/uniset.cpp \
-	third_party/icu/source/common/uniset_props.cpp \
-	third_party/icu/source/common/unisetspan.cpp \
-	third_party/icu/source/common/unistr.cpp \
-	third_party/icu/source/common/unistr_case.cpp \
-	third_party/icu/source/common/unistr_cnv.cpp \
-	third_party/icu/source/common/unistr_props.cpp \
-	third_party/icu/source/common/unorm.cpp \
-	third_party/icu/source/common/unorm_it.c \
-	third_party/icu/source/common/unormcmp.cpp \
-	third_party/icu/source/common/uobject.cpp \
-	third_party/icu/source/common/uprops.cpp \
-	third_party/icu/source/common/ures_cnv.c \
-	third_party/icu/source/common/uresbund.c \
-	third_party/icu/source/common/uresdata.c \
-	third_party/icu/source/common/usc_impl.c \
-	third_party/icu/source/common/uscript.c \
-	third_party/icu/source/common/uset.cpp \
-	third_party/icu/source/common/uset_props.cpp \
-	third_party/icu/source/common/usetiter.cpp \
-	third_party/icu/source/common/ushape.c \
-	third_party/icu/source/common/usprep.cpp \
-	third_party/icu/source/common/ustack.cpp \
-	third_party/icu/source/common/ustr_cnv.c \
-	third_party/icu/source/common/ustr_wcs.c \
-	third_party/icu/source/common/ustrcase.c \
-	third_party/icu/source/common/ustrenum.cpp \
-	third_party/icu/source/common/ustrfmt.c \
-	third_party/icu/source/common/ustring.c \
-	third_party/icu/source/common/ustrtrns.c \
-	third_party/icu/source/common/utext.cpp \
-	third_party/icu/source/common/utf_impl.c \
-	third_party/icu/source/common/util.cpp \
-	third_party/icu/source/common/util_props.cpp \
-	third_party/icu/source/common/utrace.c \
-	third_party/icu/source/common/utrie.c \
-	third_party/icu/source/common/utrie2.cpp \
-	third_party/icu/source/common/utrie2_builder.c \
-	third_party/icu/source/common/uts46.cpp \
-	third_party/icu/source/common/utypes.c \
-	third_party/icu/source/common/uvector.cpp \
-	third_party/icu/source/common/uvectr32.cpp \
-	third_party/icu/source/common/uvectr64.cpp \
-	third_party/icu/source/common/wintz.c
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS_Release := \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icuuc.host.linux-arm.mk b/icuuc.host.linux-arm.mk
deleted file mode 100644
index 474c4d3..0000000
--- a/icuuc.host.linux-arm.mk
+++ /dev/null
@@ -1,373 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/common/bmpset.cpp \
-	third_party/icu/source/common/brkeng.cpp \
-	third_party/icu/source/common/brkiter.cpp \
-	third_party/icu/source/common/bytestream.cpp \
-	third_party/icu/source/common/caniter.cpp \
-	third_party/icu/source/common/chariter.cpp \
-	third_party/icu/source/common/charstr.cpp \
-	third_party/icu/source/common/cmemory.c \
-	third_party/icu/source/common/cstring.c \
-	third_party/icu/source/common/cwchar.c \
-	third_party/icu/source/common/dictbe.cpp \
-	third_party/icu/source/common/dtintrv.cpp \
-	third_party/icu/source/common/errorcode.cpp \
-	third_party/icu/source/common/filterednormalizer2.cpp \
-	third_party/icu/source/common/icudataver.c \
-	third_party/icu/source/common/icuplug.c \
-	third_party/icu/source/common/locavailable.cpp \
-	third_party/icu/source/common/locbased.cpp \
-	third_party/icu/source/common/locdispnames.cpp \
-	third_party/icu/source/common/locid.cpp \
-	third_party/icu/source/common/loclikely.cpp \
-	third_party/icu/source/common/locmap.c \
-	third_party/icu/source/common/locresdata.cpp \
-	third_party/icu/source/common/locutil.cpp \
-	third_party/icu/source/common/mutex.cpp \
-	third_party/icu/source/common/normalizer2.cpp \
-	third_party/icu/source/common/normalizer2impl.cpp \
-	third_party/icu/source/common/normlzr.cpp \
-	third_party/icu/source/common/parsepos.cpp \
-	third_party/icu/source/common/propname.cpp \
-	third_party/icu/source/common/propsvec.c \
-	third_party/icu/source/common/punycode.c \
-	third_party/icu/source/common/putil.c \
-	third_party/icu/source/common/rbbi.cpp \
-	third_party/icu/source/common/rbbidata.cpp \
-	third_party/icu/source/common/rbbinode.cpp \
-	third_party/icu/source/common/rbbirb.cpp \
-	third_party/icu/source/common/rbbiscan.cpp \
-	third_party/icu/source/common/rbbisetb.cpp \
-	third_party/icu/source/common/rbbistbl.cpp \
-	third_party/icu/source/common/rbbitblb.cpp \
-	third_party/icu/source/common/resbund.cpp \
-	third_party/icu/source/common/resbund_cnv.cpp \
-	third_party/icu/source/common/ruleiter.cpp \
-	third_party/icu/source/common/schriter.cpp \
-	third_party/icu/source/common/serv.cpp \
-	third_party/icu/source/common/servlk.cpp \
-	third_party/icu/source/common/servlkf.cpp \
-	third_party/icu/source/common/servls.cpp \
-	third_party/icu/source/common/servnotf.cpp \
-	third_party/icu/source/common/servrbf.cpp \
-	third_party/icu/source/common/servslkf.cpp \
-	third_party/icu/source/common/stringpiece.cpp \
-	third_party/icu/source/common/triedict.cpp \
-	third_party/icu/source/common/uarrsort.c \
-	third_party/icu/source/common/ubidi.c \
-	third_party/icu/source/common/ubidi_props.c \
-	third_party/icu/source/common/ubidiln.c \
-	third_party/icu/source/common/ubidiwrt.c \
-	third_party/icu/source/common/ubrk.cpp \
-	third_party/icu/source/common/ucase.c \
-	third_party/icu/source/common/ucasemap.c \
-	third_party/icu/source/common/ucat.c \
-	third_party/icu/source/common/uchar.c \
-	third_party/icu/source/common/uchriter.cpp \
-	third_party/icu/source/common/ucln_cmn.c \
-	third_party/icu/source/common/ucmndata.c \
-	third_party/icu/source/common/ucnv.c \
-	third_party/icu/source/common/ucnv2022.c \
-	third_party/icu/source/common/ucnv_bld.c \
-	third_party/icu/source/common/ucnv_cb.c \
-	third_party/icu/source/common/ucnv_cnv.c \
-	third_party/icu/source/common/ucnv_err.c \
-	third_party/icu/source/common/ucnv_ext.c \
-	third_party/icu/source/common/ucnv_io.c \
-	third_party/icu/source/common/ucnv_lmb.c \
-	third_party/icu/source/common/ucnv_set.c \
-	third_party/icu/source/common/ucnv_u16.c \
-	third_party/icu/source/common/ucnv_u32.c \
-	third_party/icu/source/common/ucnv_u7.c \
-	third_party/icu/source/common/ucnv_u8.c \
-	third_party/icu/source/common/ucnvbocu.c \
-	third_party/icu/source/common/ucnvdisp.c \
-	third_party/icu/source/common/ucnvhz.c \
-	third_party/icu/source/common/ucnvisci.c \
-	third_party/icu/source/common/ucnvlat1.c \
-	third_party/icu/source/common/ucnvmbcs.c \
-	third_party/icu/source/common/ucnvscsu.c \
-	third_party/icu/source/common/ucnvsel.cpp \
-	third_party/icu/source/common/ucol_swp.cpp \
-	third_party/icu/source/common/udata.cpp \
-	third_party/icu/source/common/udatamem.c \
-	third_party/icu/source/common/udataswp.c \
-	third_party/icu/source/common/uenum.c \
-	third_party/icu/source/common/uhash.c \
-	third_party/icu/source/common/uhash_us.cpp \
-	third_party/icu/source/common/uidna.cpp \
-	third_party/icu/source/common/uinit.c \
-	third_party/icu/source/common/uinvchar.c \
-	third_party/icu/source/common/uiter.cpp \
-	third_party/icu/source/common/ulist.c \
-	third_party/icu/source/common/uloc.c \
-	third_party/icu/source/common/uloc_tag.c \
-	third_party/icu/source/common/umapfile.c \
-	third_party/icu/source/common/umath.c \
-	third_party/icu/source/common/umutex.c \
-	third_party/icu/source/common/unames.c \
-	third_party/icu/source/common/unifilt.cpp \
-	third_party/icu/source/common/unifunct.cpp \
-	third_party/icu/source/common/uniset.cpp \
-	third_party/icu/source/common/uniset_props.cpp \
-	third_party/icu/source/common/unisetspan.cpp \
-	third_party/icu/source/common/unistr.cpp \
-	third_party/icu/source/common/unistr_case.cpp \
-	third_party/icu/source/common/unistr_cnv.cpp \
-	third_party/icu/source/common/unistr_props.cpp \
-	third_party/icu/source/common/unorm.cpp \
-	third_party/icu/source/common/unorm_it.c \
-	third_party/icu/source/common/unormcmp.cpp \
-	third_party/icu/source/common/uobject.cpp \
-	third_party/icu/source/common/uprops.cpp \
-	third_party/icu/source/common/ures_cnv.c \
-	third_party/icu/source/common/uresbund.c \
-	third_party/icu/source/common/uresdata.c \
-	third_party/icu/source/common/usc_impl.c \
-	third_party/icu/source/common/uscript.c \
-	third_party/icu/source/common/uset.cpp \
-	third_party/icu/source/common/uset_props.cpp \
-	third_party/icu/source/common/usetiter.cpp \
-	third_party/icu/source/common/ushape.c \
-	third_party/icu/source/common/usprep.cpp \
-	third_party/icu/source/common/ustack.cpp \
-	third_party/icu/source/common/ustr_cnv.c \
-	third_party/icu/source/common/ustr_wcs.c \
-	third_party/icu/source/common/ustrcase.c \
-	third_party/icu/source/common/ustrenum.cpp \
-	third_party/icu/source/common/ustrfmt.c \
-	third_party/icu/source/common/ustring.c \
-	third_party/icu/source/common/ustrtrns.c \
-	third_party/icu/source/common/utext.cpp \
-	third_party/icu/source/common/utf_impl.c \
-	third_party/icu/source/common/util.cpp \
-	third_party/icu/source/common/util_props.cpp \
-	third_party/icu/source/common/utrace.c \
-	third_party/icu/source/common/utrie.c \
-	third_party/icu/source/common/utrie2.cpp \
-	third_party/icu/source/common/utrie2_builder.c \
-	third_party/icu/source/common/uts46.cpp \
-	third_party/icu/source/common/utypes.c \
-	third_party/icu/source/common/uvector.cpp \
-	third_party/icu/source/common/uvectr32.cpp \
-	third_party/icu/source/common/uvectr64.cpp \
-	third_party/icu/source/common/wintz.c
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icuuc.host.linux-arm64.mk b/icuuc.host.linux-arm64.mk
deleted file mode 100644
index 834db11..0000000
--- a/icuuc.host.linux-arm64.mk
+++ /dev/null
@@ -1,373 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/common/bmpset.cpp \
-	third_party/icu/source/common/brkeng.cpp \
-	third_party/icu/source/common/brkiter.cpp \
-	third_party/icu/source/common/bytestream.cpp \
-	third_party/icu/source/common/caniter.cpp \
-	third_party/icu/source/common/chariter.cpp \
-	third_party/icu/source/common/charstr.cpp \
-	third_party/icu/source/common/cmemory.c \
-	third_party/icu/source/common/cstring.c \
-	third_party/icu/source/common/cwchar.c \
-	third_party/icu/source/common/dictbe.cpp \
-	third_party/icu/source/common/dtintrv.cpp \
-	third_party/icu/source/common/errorcode.cpp \
-	third_party/icu/source/common/filterednormalizer2.cpp \
-	third_party/icu/source/common/icudataver.c \
-	third_party/icu/source/common/icuplug.c \
-	third_party/icu/source/common/locavailable.cpp \
-	third_party/icu/source/common/locbased.cpp \
-	third_party/icu/source/common/locdispnames.cpp \
-	third_party/icu/source/common/locid.cpp \
-	third_party/icu/source/common/loclikely.cpp \
-	third_party/icu/source/common/locmap.c \
-	third_party/icu/source/common/locresdata.cpp \
-	third_party/icu/source/common/locutil.cpp \
-	third_party/icu/source/common/mutex.cpp \
-	third_party/icu/source/common/normalizer2.cpp \
-	third_party/icu/source/common/normalizer2impl.cpp \
-	third_party/icu/source/common/normlzr.cpp \
-	third_party/icu/source/common/parsepos.cpp \
-	third_party/icu/source/common/propname.cpp \
-	third_party/icu/source/common/propsvec.c \
-	third_party/icu/source/common/punycode.c \
-	third_party/icu/source/common/putil.c \
-	third_party/icu/source/common/rbbi.cpp \
-	third_party/icu/source/common/rbbidata.cpp \
-	third_party/icu/source/common/rbbinode.cpp \
-	third_party/icu/source/common/rbbirb.cpp \
-	third_party/icu/source/common/rbbiscan.cpp \
-	third_party/icu/source/common/rbbisetb.cpp \
-	third_party/icu/source/common/rbbistbl.cpp \
-	third_party/icu/source/common/rbbitblb.cpp \
-	third_party/icu/source/common/resbund.cpp \
-	third_party/icu/source/common/resbund_cnv.cpp \
-	third_party/icu/source/common/ruleiter.cpp \
-	third_party/icu/source/common/schriter.cpp \
-	third_party/icu/source/common/serv.cpp \
-	third_party/icu/source/common/servlk.cpp \
-	third_party/icu/source/common/servlkf.cpp \
-	third_party/icu/source/common/servls.cpp \
-	third_party/icu/source/common/servnotf.cpp \
-	third_party/icu/source/common/servrbf.cpp \
-	third_party/icu/source/common/servslkf.cpp \
-	third_party/icu/source/common/stringpiece.cpp \
-	third_party/icu/source/common/triedict.cpp \
-	third_party/icu/source/common/uarrsort.c \
-	third_party/icu/source/common/ubidi.c \
-	third_party/icu/source/common/ubidi_props.c \
-	third_party/icu/source/common/ubidiln.c \
-	third_party/icu/source/common/ubidiwrt.c \
-	third_party/icu/source/common/ubrk.cpp \
-	third_party/icu/source/common/ucase.c \
-	third_party/icu/source/common/ucasemap.c \
-	third_party/icu/source/common/ucat.c \
-	third_party/icu/source/common/uchar.c \
-	third_party/icu/source/common/uchriter.cpp \
-	third_party/icu/source/common/ucln_cmn.c \
-	third_party/icu/source/common/ucmndata.c \
-	third_party/icu/source/common/ucnv.c \
-	third_party/icu/source/common/ucnv2022.c \
-	third_party/icu/source/common/ucnv_bld.c \
-	third_party/icu/source/common/ucnv_cb.c \
-	third_party/icu/source/common/ucnv_cnv.c \
-	third_party/icu/source/common/ucnv_err.c \
-	third_party/icu/source/common/ucnv_ext.c \
-	third_party/icu/source/common/ucnv_io.c \
-	third_party/icu/source/common/ucnv_lmb.c \
-	third_party/icu/source/common/ucnv_set.c \
-	third_party/icu/source/common/ucnv_u16.c \
-	third_party/icu/source/common/ucnv_u32.c \
-	third_party/icu/source/common/ucnv_u7.c \
-	third_party/icu/source/common/ucnv_u8.c \
-	third_party/icu/source/common/ucnvbocu.c \
-	third_party/icu/source/common/ucnvdisp.c \
-	third_party/icu/source/common/ucnvhz.c \
-	third_party/icu/source/common/ucnvisci.c \
-	third_party/icu/source/common/ucnvlat1.c \
-	third_party/icu/source/common/ucnvmbcs.c \
-	third_party/icu/source/common/ucnvscsu.c \
-	third_party/icu/source/common/ucnvsel.cpp \
-	third_party/icu/source/common/ucol_swp.cpp \
-	third_party/icu/source/common/udata.cpp \
-	third_party/icu/source/common/udatamem.c \
-	third_party/icu/source/common/udataswp.c \
-	third_party/icu/source/common/uenum.c \
-	third_party/icu/source/common/uhash.c \
-	third_party/icu/source/common/uhash_us.cpp \
-	third_party/icu/source/common/uidna.cpp \
-	third_party/icu/source/common/uinit.c \
-	third_party/icu/source/common/uinvchar.c \
-	third_party/icu/source/common/uiter.cpp \
-	third_party/icu/source/common/ulist.c \
-	third_party/icu/source/common/uloc.c \
-	third_party/icu/source/common/uloc_tag.c \
-	third_party/icu/source/common/umapfile.c \
-	third_party/icu/source/common/umath.c \
-	third_party/icu/source/common/umutex.c \
-	third_party/icu/source/common/unames.c \
-	third_party/icu/source/common/unifilt.cpp \
-	third_party/icu/source/common/unifunct.cpp \
-	third_party/icu/source/common/uniset.cpp \
-	third_party/icu/source/common/uniset_props.cpp \
-	third_party/icu/source/common/unisetspan.cpp \
-	third_party/icu/source/common/unistr.cpp \
-	third_party/icu/source/common/unistr_case.cpp \
-	third_party/icu/source/common/unistr_cnv.cpp \
-	third_party/icu/source/common/unistr_props.cpp \
-	third_party/icu/source/common/unorm.cpp \
-	third_party/icu/source/common/unorm_it.c \
-	third_party/icu/source/common/unormcmp.cpp \
-	third_party/icu/source/common/uobject.cpp \
-	third_party/icu/source/common/uprops.cpp \
-	third_party/icu/source/common/ures_cnv.c \
-	third_party/icu/source/common/uresbund.c \
-	third_party/icu/source/common/uresdata.c \
-	third_party/icu/source/common/usc_impl.c \
-	third_party/icu/source/common/uscript.c \
-	third_party/icu/source/common/uset.cpp \
-	third_party/icu/source/common/uset_props.cpp \
-	third_party/icu/source/common/usetiter.cpp \
-	third_party/icu/source/common/ushape.c \
-	third_party/icu/source/common/usprep.cpp \
-	third_party/icu/source/common/ustack.cpp \
-	third_party/icu/source/common/ustr_cnv.c \
-	third_party/icu/source/common/ustr_wcs.c \
-	third_party/icu/source/common/ustrcase.c \
-	third_party/icu/source/common/ustrenum.cpp \
-	third_party/icu/source/common/ustrfmt.c \
-	third_party/icu/source/common/ustring.c \
-	third_party/icu/source/common/ustrtrns.c \
-	third_party/icu/source/common/utext.cpp \
-	third_party/icu/source/common/utf_impl.c \
-	third_party/icu/source/common/util.cpp \
-	third_party/icu/source/common/util_props.cpp \
-	third_party/icu/source/common/utrace.c \
-	third_party/icu/source/common/utrie.c \
-	third_party/icu/source/common/utrie2.cpp \
-	third_party/icu/source/common/utrie2_builder.c \
-	third_party/icu/source/common/uts46.cpp \
-	third_party/icu/source/common/utypes.c \
-	third_party/icu/source/common/uvector.cpp \
-	third_party/icu/source/common/uvectr32.cpp \
-	third_party/icu/source/common/uvectr64.cpp \
-	third_party/icu/source/common/wintz.c
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icuuc.host.linux-mips.mk b/icuuc.host.linux-mips.mk
deleted file mode 100644
index 95dff24..0000000
--- a/icuuc.host.linux-mips.mk
+++ /dev/null
@@ -1,375 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/common/bmpset.cpp \
-	third_party/icu/source/common/brkeng.cpp \
-	third_party/icu/source/common/brkiter.cpp \
-	third_party/icu/source/common/bytestream.cpp \
-	third_party/icu/source/common/caniter.cpp \
-	third_party/icu/source/common/chariter.cpp \
-	third_party/icu/source/common/charstr.cpp \
-	third_party/icu/source/common/cmemory.c \
-	third_party/icu/source/common/cstring.c \
-	third_party/icu/source/common/cwchar.c \
-	third_party/icu/source/common/dictbe.cpp \
-	third_party/icu/source/common/dtintrv.cpp \
-	third_party/icu/source/common/errorcode.cpp \
-	third_party/icu/source/common/filterednormalizer2.cpp \
-	third_party/icu/source/common/icudataver.c \
-	third_party/icu/source/common/icuplug.c \
-	third_party/icu/source/common/locavailable.cpp \
-	third_party/icu/source/common/locbased.cpp \
-	third_party/icu/source/common/locdispnames.cpp \
-	third_party/icu/source/common/locid.cpp \
-	third_party/icu/source/common/loclikely.cpp \
-	third_party/icu/source/common/locmap.c \
-	third_party/icu/source/common/locresdata.cpp \
-	third_party/icu/source/common/locutil.cpp \
-	third_party/icu/source/common/mutex.cpp \
-	third_party/icu/source/common/normalizer2.cpp \
-	third_party/icu/source/common/normalizer2impl.cpp \
-	third_party/icu/source/common/normlzr.cpp \
-	third_party/icu/source/common/parsepos.cpp \
-	third_party/icu/source/common/propname.cpp \
-	third_party/icu/source/common/propsvec.c \
-	third_party/icu/source/common/punycode.c \
-	third_party/icu/source/common/putil.c \
-	third_party/icu/source/common/rbbi.cpp \
-	third_party/icu/source/common/rbbidata.cpp \
-	third_party/icu/source/common/rbbinode.cpp \
-	third_party/icu/source/common/rbbirb.cpp \
-	third_party/icu/source/common/rbbiscan.cpp \
-	third_party/icu/source/common/rbbisetb.cpp \
-	third_party/icu/source/common/rbbistbl.cpp \
-	third_party/icu/source/common/rbbitblb.cpp \
-	third_party/icu/source/common/resbund.cpp \
-	third_party/icu/source/common/resbund_cnv.cpp \
-	third_party/icu/source/common/ruleiter.cpp \
-	third_party/icu/source/common/schriter.cpp \
-	third_party/icu/source/common/serv.cpp \
-	third_party/icu/source/common/servlk.cpp \
-	third_party/icu/source/common/servlkf.cpp \
-	third_party/icu/source/common/servls.cpp \
-	third_party/icu/source/common/servnotf.cpp \
-	third_party/icu/source/common/servrbf.cpp \
-	third_party/icu/source/common/servslkf.cpp \
-	third_party/icu/source/common/stringpiece.cpp \
-	third_party/icu/source/common/triedict.cpp \
-	third_party/icu/source/common/uarrsort.c \
-	third_party/icu/source/common/ubidi.c \
-	third_party/icu/source/common/ubidi_props.c \
-	third_party/icu/source/common/ubidiln.c \
-	third_party/icu/source/common/ubidiwrt.c \
-	third_party/icu/source/common/ubrk.cpp \
-	third_party/icu/source/common/ucase.c \
-	third_party/icu/source/common/ucasemap.c \
-	third_party/icu/source/common/ucat.c \
-	third_party/icu/source/common/uchar.c \
-	third_party/icu/source/common/uchriter.cpp \
-	third_party/icu/source/common/ucln_cmn.c \
-	third_party/icu/source/common/ucmndata.c \
-	third_party/icu/source/common/ucnv.c \
-	third_party/icu/source/common/ucnv2022.c \
-	third_party/icu/source/common/ucnv_bld.c \
-	third_party/icu/source/common/ucnv_cb.c \
-	third_party/icu/source/common/ucnv_cnv.c \
-	third_party/icu/source/common/ucnv_err.c \
-	third_party/icu/source/common/ucnv_ext.c \
-	third_party/icu/source/common/ucnv_io.c \
-	third_party/icu/source/common/ucnv_lmb.c \
-	third_party/icu/source/common/ucnv_set.c \
-	third_party/icu/source/common/ucnv_u16.c \
-	third_party/icu/source/common/ucnv_u32.c \
-	third_party/icu/source/common/ucnv_u7.c \
-	third_party/icu/source/common/ucnv_u8.c \
-	third_party/icu/source/common/ucnvbocu.c \
-	third_party/icu/source/common/ucnvdisp.c \
-	third_party/icu/source/common/ucnvhz.c \
-	third_party/icu/source/common/ucnvisci.c \
-	third_party/icu/source/common/ucnvlat1.c \
-	third_party/icu/source/common/ucnvmbcs.c \
-	third_party/icu/source/common/ucnvscsu.c \
-	third_party/icu/source/common/ucnvsel.cpp \
-	third_party/icu/source/common/ucol_swp.cpp \
-	third_party/icu/source/common/udata.cpp \
-	third_party/icu/source/common/udatamem.c \
-	third_party/icu/source/common/udataswp.c \
-	third_party/icu/source/common/uenum.c \
-	third_party/icu/source/common/uhash.c \
-	third_party/icu/source/common/uhash_us.cpp \
-	third_party/icu/source/common/uidna.cpp \
-	third_party/icu/source/common/uinit.c \
-	third_party/icu/source/common/uinvchar.c \
-	third_party/icu/source/common/uiter.cpp \
-	third_party/icu/source/common/ulist.c \
-	third_party/icu/source/common/uloc.c \
-	third_party/icu/source/common/uloc_tag.c \
-	third_party/icu/source/common/umapfile.c \
-	third_party/icu/source/common/umath.c \
-	third_party/icu/source/common/umutex.c \
-	third_party/icu/source/common/unames.c \
-	third_party/icu/source/common/unifilt.cpp \
-	third_party/icu/source/common/unifunct.cpp \
-	third_party/icu/source/common/uniset.cpp \
-	third_party/icu/source/common/uniset_props.cpp \
-	third_party/icu/source/common/unisetspan.cpp \
-	third_party/icu/source/common/unistr.cpp \
-	third_party/icu/source/common/unistr_case.cpp \
-	third_party/icu/source/common/unistr_cnv.cpp \
-	third_party/icu/source/common/unistr_props.cpp \
-	third_party/icu/source/common/unorm.cpp \
-	third_party/icu/source/common/unorm_it.c \
-	third_party/icu/source/common/unormcmp.cpp \
-	third_party/icu/source/common/uobject.cpp \
-	third_party/icu/source/common/uprops.cpp \
-	third_party/icu/source/common/ures_cnv.c \
-	third_party/icu/source/common/uresbund.c \
-	third_party/icu/source/common/uresdata.c \
-	third_party/icu/source/common/usc_impl.c \
-	third_party/icu/source/common/uscript.c \
-	third_party/icu/source/common/uset.cpp \
-	third_party/icu/source/common/uset_props.cpp \
-	third_party/icu/source/common/usetiter.cpp \
-	third_party/icu/source/common/ushape.c \
-	third_party/icu/source/common/usprep.cpp \
-	third_party/icu/source/common/ustack.cpp \
-	third_party/icu/source/common/ustr_cnv.c \
-	third_party/icu/source/common/ustr_wcs.c \
-	third_party/icu/source/common/ustrcase.c \
-	third_party/icu/source/common/ustrenum.cpp \
-	third_party/icu/source/common/ustrfmt.c \
-	third_party/icu/source/common/ustring.c \
-	third_party/icu/source/common/ustrtrns.c \
-	third_party/icu/source/common/utext.cpp \
-	third_party/icu/source/common/utf_impl.c \
-	third_party/icu/source/common/util.cpp \
-	third_party/icu/source/common/util_props.cpp \
-	third_party/icu/source/common/utrace.c \
-	third_party/icu/source/common/utrie.c \
-	third_party/icu/source/common/utrie2.cpp \
-	third_party/icu/source/common/utrie2_builder.c \
-	third_party/icu/source/common/uts46.cpp \
-	third_party/icu/source/common/utypes.c \
-	third_party/icu/source/common/uvector.cpp \
-	third_party/icu/source/common/uvectr32.cpp \
-	third_party/icu/source/common/uvectr64.cpp \
-	third_party/icu/source/common/wintz.c
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icuuc.host.linux-x86.mk b/icuuc.host.linux-x86.mk
deleted file mode 100644
index 474c4d3..0000000
--- a/icuuc.host.linux-x86.mk
+++ /dev/null
@@ -1,373 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/common/bmpset.cpp \
-	third_party/icu/source/common/brkeng.cpp \
-	third_party/icu/source/common/brkiter.cpp \
-	third_party/icu/source/common/bytestream.cpp \
-	third_party/icu/source/common/caniter.cpp \
-	third_party/icu/source/common/chariter.cpp \
-	third_party/icu/source/common/charstr.cpp \
-	third_party/icu/source/common/cmemory.c \
-	third_party/icu/source/common/cstring.c \
-	third_party/icu/source/common/cwchar.c \
-	third_party/icu/source/common/dictbe.cpp \
-	third_party/icu/source/common/dtintrv.cpp \
-	third_party/icu/source/common/errorcode.cpp \
-	third_party/icu/source/common/filterednormalizer2.cpp \
-	third_party/icu/source/common/icudataver.c \
-	third_party/icu/source/common/icuplug.c \
-	third_party/icu/source/common/locavailable.cpp \
-	third_party/icu/source/common/locbased.cpp \
-	third_party/icu/source/common/locdispnames.cpp \
-	third_party/icu/source/common/locid.cpp \
-	third_party/icu/source/common/loclikely.cpp \
-	third_party/icu/source/common/locmap.c \
-	third_party/icu/source/common/locresdata.cpp \
-	third_party/icu/source/common/locutil.cpp \
-	third_party/icu/source/common/mutex.cpp \
-	third_party/icu/source/common/normalizer2.cpp \
-	third_party/icu/source/common/normalizer2impl.cpp \
-	third_party/icu/source/common/normlzr.cpp \
-	third_party/icu/source/common/parsepos.cpp \
-	third_party/icu/source/common/propname.cpp \
-	third_party/icu/source/common/propsvec.c \
-	third_party/icu/source/common/punycode.c \
-	third_party/icu/source/common/putil.c \
-	third_party/icu/source/common/rbbi.cpp \
-	third_party/icu/source/common/rbbidata.cpp \
-	third_party/icu/source/common/rbbinode.cpp \
-	third_party/icu/source/common/rbbirb.cpp \
-	third_party/icu/source/common/rbbiscan.cpp \
-	third_party/icu/source/common/rbbisetb.cpp \
-	third_party/icu/source/common/rbbistbl.cpp \
-	third_party/icu/source/common/rbbitblb.cpp \
-	third_party/icu/source/common/resbund.cpp \
-	third_party/icu/source/common/resbund_cnv.cpp \
-	third_party/icu/source/common/ruleiter.cpp \
-	third_party/icu/source/common/schriter.cpp \
-	third_party/icu/source/common/serv.cpp \
-	third_party/icu/source/common/servlk.cpp \
-	third_party/icu/source/common/servlkf.cpp \
-	third_party/icu/source/common/servls.cpp \
-	third_party/icu/source/common/servnotf.cpp \
-	third_party/icu/source/common/servrbf.cpp \
-	third_party/icu/source/common/servslkf.cpp \
-	third_party/icu/source/common/stringpiece.cpp \
-	third_party/icu/source/common/triedict.cpp \
-	third_party/icu/source/common/uarrsort.c \
-	third_party/icu/source/common/ubidi.c \
-	third_party/icu/source/common/ubidi_props.c \
-	third_party/icu/source/common/ubidiln.c \
-	third_party/icu/source/common/ubidiwrt.c \
-	third_party/icu/source/common/ubrk.cpp \
-	third_party/icu/source/common/ucase.c \
-	third_party/icu/source/common/ucasemap.c \
-	third_party/icu/source/common/ucat.c \
-	third_party/icu/source/common/uchar.c \
-	third_party/icu/source/common/uchriter.cpp \
-	third_party/icu/source/common/ucln_cmn.c \
-	third_party/icu/source/common/ucmndata.c \
-	third_party/icu/source/common/ucnv.c \
-	third_party/icu/source/common/ucnv2022.c \
-	third_party/icu/source/common/ucnv_bld.c \
-	third_party/icu/source/common/ucnv_cb.c \
-	third_party/icu/source/common/ucnv_cnv.c \
-	third_party/icu/source/common/ucnv_err.c \
-	third_party/icu/source/common/ucnv_ext.c \
-	third_party/icu/source/common/ucnv_io.c \
-	third_party/icu/source/common/ucnv_lmb.c \
-	third_party/icu/source/common/ucnv_set.c \
-	third_party/icu/source/common/ucnv_u16.c \
-	third_party/icu/source/common/ucnv_u32.c \
-	third_party/icu/source/common/ucnv_u7.c \
-	third_party/icu/source/common/ucnv_u8.c \
-	third_party/icu/source/common/ucnvbocu.c \
-	third_party/icu/source/common/ucnvdisp.c \
-	third_party/icu/source/common/ucnvhz.c \
-	third_party/icu/source/common/ucnvisci.c \
-	third_party/icu/source/common/ucnvlat1.c \
-	third_party/icu/source/common/ucnvmbcs.c \
-	third_party/icu/source/common/ucnvscsu.c \
-	third_party/icu/source/common/ucnvsel.cpp \
-	third_party/icu/source/common/ucol_swp.cpp \
-	third_party/icu/source/common/udata.cpp \
-	third_party/icu/source/common/udatamem.c \
-	third_party/icu/source/common/udataswp.c \
-	third_party/icu/source/common/uenum.c \
-	third_party/icu/source/common/uhash.c \
-	third_party/icu/source/common/uhash_us.cpp \
-	third_party/icu/source/common/uidna.cpp \
-	third_party/icu/source/common/uinit.c \
-	third_party/icu/source/common/uinvchar.c \
-	third_party/icu/source/common/uiter.cpp \
-	third_party/icu/source/common/ulist.c \
-	third_party/icu/source/common/uloc.c \
-	third_party/icu/source/common/uloc_tag.c \
-	third_party/icu/source/common/umapfile.c \
-	third_party/icu/source/common/umath.c \
-	third_party/icu/source/common/umutex.c \
-	third_party/icu/source/common/unames.c \
-	third_party/icu/source/common/unifilt.cpp \
-	third_party/icu/source/common/unifunct.cpp \
-	third_party/icu/source/common/uniset.cpp \
-	third_party/icu/source/common/uniset_props.cpp \
-	third_party/icu/source/common/unisetspan.cpp \
-	third_party/icu/source/common/unistr.cpp \
-	third_party/icu/source/common/unistr_case.cpp \
-	third_party/icu/source/common/unistr_cnv.cpp \
-	third_party/icu/source/common/unistr_props.cpp \
-	third_party/icu/source/common/unorm.cpp \
-	third_party/icu/source/common/unorm_it.c \
-	third_party/icu/source/common/unormcmp.cpp \
-	third_party/icu/source/common/uobject.cpp \
-	third_party/icu/source/common/uprops.cpp \
-	third_party/icu/source/common/ures_cnv.c \
-	third_party/icu/source/common/uresbund.c \
-	third_party/icu/source/common/uresdata.c \
-	third_party/icu/source/common/usc_impl.c \
-	third_party/icu/source/common/uscript.c \
-	third_party/icu/source/common/uset.cpp \
-	third_party/icu/source/common/uset_props.cpp \
-	third_party/icu/source/common/usetiter.cpp \
-	third_party/icu/source/common/ushape.c \
-	third_party/icu/source/common/usprep.cpp \
-	third_party/icu/source/common/ustack.cpp \
-	third_party/icu/source/common/ustr_cnv.c \
-	third_party/icu/source/common/ustr_wcs.c \
-	third_party/icu/source/common/ustrcase.c \
-	third_party/icu/source/common/ustrenum.cpp \
-	third_party/icu/source/common/ustrfmt.c \
-	third_party/icu/source/common/ustring.c \
-	third_party/icu/source/common/ustrtrns.c \
-	third_party/icu/source/common/utext.cpp \
-	third_party/icu/source/common/utf_impl.c \
-	third_party/icu/source/common/util.cpp \
-	third_party/icu/source/common/util_props.cpp \
-	third_party/icu/source/common/utrace.c \
-	third_party/icu/source/common/utrie.c \
-	third_party/icu/source/common/utrie2.cpp \
-	third_party/icu/source/common/utrie2_builder.c \
-	third_party/icu/source/common/uts46.cpp \
-	third_party/icu/source/common/utypes.c \
-	third_party/icu/source/common/uvector.cpp \
-	third_party/icu/source/common/uvectr32.cpp \
-	third_party/icu/source/common/uvectr64.cpp \
-	third_party/icu/source/common/wintz.c
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m32 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m32
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icuuc.host.linux-x86_64.mk b/icuuc.host.linux-x86_64.mk
deleted file mode 100644
index 834db11..0000000
--- a/icuuc.host.linux-x86_64.mk
+++ /dev/null
@@ -1,373 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE := third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-LOCAL_MODULE_SUFFIX := .a
-LOCAL_MODULE_TAGS := optional
-LOCAL_IS_HOST_MODULE := true
-LOCAL_MULTILIB := $(GYP_HOST_MULTILIB)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_HOST_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 :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-LOCAL_GENERATED_SOURCES :=
-
-GYP_COPIED_SOURCE_ORIGIN_DIRS :=
-
-LOCAL_SRC_FILES := \
-	third_party/icu/source/common/bmpset.cpp \
-	third_party/icu/source/common/brkeng.cpp \
-	third_party/icu/source/common/brkiter.cpp \
-	third_party/icu/source/common/bytestream.cpp \
-	third_party/icu/source/common/caniter.cpp \
-	third_party/icu/source/common/chariter.cpp \
-	third_party/icu/source/common/charstr.cpp \
-	third_party/icu/source/common/cmemory.c \
-	third_party/icu/source/common/cstring.c \
-	third_party/icu/source/common/cwchar.c \
-	third_party/icu/source/common/dictbe.cpp \
-	third_party/icu/source/common/dtintrv.cpp \
-	third_party/icu/source/common/errorcode.cpp \
-	third_party/icu/source/common/filterednormalizer2.cpp \
-	third_party/icu/source/common/icudataver.c \
-	third_party/icu/source/common/icuplug.c \
-	third_party/icu/source/common/locavailable.cpp \
-	third_party/icu/source/common/locbased.cpp \
-	third_party/icu/source/common/locdispnames.cpp \
-	third_party/icu/source/common/locid.cpp \
-	third_party/icu/source/common/loclikely.cpp \
-	third_party/icu/source/common/locmap.c \
-	third_party/icu/source/common/locresdata.cpp \
-	third_party/icu/source/common/locutil.cpp \
-	third_party/icu/source/common/mutex.cpp \
-	third_party/icu/source/common/normalizer2.cpp \
-	third_party/icu/source/common/normalizer2impl.cpp \
-	third_party/icu/source/common/normlzr.cpp \
-	third_party/icu/source/common/parsepos.cpp \
-	third_party/icu/source/common/propname.cpp \
-	third_party/icu/source/common/propsvec.c \
-	third_party/icu/source/common/punycode.c \
-	third_party/icu/source/common/putil.c \
-	third_party/icu/source/common/rbbi.cpp \
-	third_party/icu/source/common/rbbidata.cpp \
-	third_party/icu/source/common/rbbinode.cpp \
-	third_party/icu/source/common/rbbirb.cpp \
-	third_party/icu/source/common/rbbiscan.cpp \
-	third_party/icu/source/common/rbbisetb.cpp \
-	third_party/icu/source/common/rbbistbl.cpp \
-	third_party/icu/source/common/rbbitblb.cpp \
-	third_party/icu/source/common/resbund.cpp \
-	third_party/icu/source/common/resbund_cnv.cpp \
-	third_party/icu/source/common/ruleiter.cpp \
-	third_party/icu/source/common/schriter.cpp \
-	third_party/icu/source/common/serv.cpp \
-	third_party/icu/source/common/servlk.cpp \
-	third_party/icu/source/common/servlkf.cpp \
-	third_party/icu/source/common/servls.cpp \
-	third_party/icu/source/common/servnotf.cpp \
-	third_party/icu/source/common/servrbf.cpp \
-	third_party/icu/source/common/servslkf.cpp \
-	third_party/icu/source/common/stringpiece.cpp \
-	third_party/icu/source/common/triedict.cpp \
-	third_party/icu/source/common/uarrsort.c \
-	third_party/icu/source/common/ubidi.c \
-	third_party/icu/source/common/ubidi_props.c \
-	third_party/icu/source/common/ubidiln.c \
-	third_party/icu/source/common/ubidiwrt.c \
-	third_party/icu/source/common/ubrk.cpp \
-	third_party/icu/source/common/ucase.c \
-	third_party/icu/source/common/ucasemap.c \
-	third_party/icu/source/common/ucat.c \
-	third_party/icu/source/common/uchar.c \
-	third_party/icu/source/common/uchriter.cpp \
-	third_party/icu/source/common/ucln_cmn.c \
-	third_party/icu/source/common/ucmndata.c \
-	third_party/icu/source/common/ucnv.c \
-	third_party/icu/source/common/ucnv2022.c \
-	third_party/icu/source/common/ucnv_bld.c \
-	third_party/icu/source/common/ucnv_cb.c \
-	third_party/icu/source/common/ucnv_cnv.c \
-	third_party/icu/source/common/ucnv_err.c \
-	third_party/icu/source/common/ucnv_ext.c \
-	third_party/icu/source/common/ucnv_io.c \
-	third_party/icu/source/common/ucnv_lmb.c \
-	third_party/icu/source/common/ucnv_set.c \
-	third_party/icu/source/common/ucnv_u16.c \
-	third_party/icu/source/common/ucnv_u32.c \
-	third_party/icu/source/common/ucnv_u7.c \
-	third_party/icu/source/common/ucnv_u8.c \
-	third_party/icu/source/common/ucnvbocu.c \
-	third_party/icu/source/common/ucnvdisp.c \
-	third_party/icu/source/common/ucnvhz.c \
-	third_party/icu/source/common/ucnvisci.c \
-	third_party/icu/source/common/ucnvlat1.c \
-	third_party/icu/source/common/ucnvmbcs.c \
-	third_party/icu/source/common/ucnvscsu.c \
-	third_party/icu/source/common/ucnvsel.cpp \
-	third_party/icu/source/common/ucol_swp.cpp \
-	third_party/icu/source/common/udata.cpp \
-	third_party/icu/source/common/udatamem.c \
-	third_party/icu/source/common/udataswp.c \
-	third_party/icu/source/common/uenum.c \
-	third_party/icu/source/common/uhash.c \
-	third_party/icu/source/common/uhash_us.cpp \
-	third_party/icu/source/common/uidna.cpp \
-	third_party/icu/source/common/uinit.c \
-	third_party/icu/source/common/uinvchar.c \
-	third_party/icu/source/common/uiter.cpp \
-	third_party/icu/source/common/ulist.c \
-	third_party/icu/source/common/uloc.c \
-	third_party/icu/source/common/uloc_tag.c \
-	third_party/icu/source/common/umapfile.c \
-	third_party/icu/source/common/umath.c \
-	third_party/icu/source/common/umutex.c \
-	third_party/icu/source/common/unames.c \
-	third_party/icu/source/common/unifilt.cpp \
-	third_party/icu/source/common/unifunct.cpp \
-	third_party/icu/source/common/uniset.cpp \
-	third_party/icu/source/common/uniset_props.cpp \
-	third_party/icu/source/common/unisetspan.cpp \
-	third_party/icu/source/common/unistr.cpp \
-	third_party/icu/source/common/unistr_case.cpp \
-	third_party/icu/source/common/unistr_cnv.cpp \
-	third_party/icu/source/common/unistr_props.cpp \
-	third_party/icu/source/common/unorm.cpp \
-	third_party/icu/source/common/unorm_it.c \
-	third_party/icu/source/common/unormcmp.cpp \
-	third_party/icu/source/common/uobject.cpp \
-	third_party/icu/source/common/uprops.cpp \
-	third_party/icu/source/common/ures_cnv.c \
-	third_party/icu/source/common/uresbund.c \
-	third_party/icu/source/common/uresdata.c \
-	third_party/icu/source/common/usc_impl.c \
-	third_party/icu/source/common/uscript.c \
-	third_party/icu/source/common/uset.cpp \
-	third_party/icu/source/common/uset_props.cpp \
-	third_party/icu/source/common/usetiter.cpp \
-	third_party/icu/source/common/ushape.c \
-	third_party/icu/source/common/usprep.cpp \
-	third_party/icu/source/common/ustack.cpp \
-	third_party/icu/source/common/ustr_cnv.c \
-	third_party/icu/source/common/ustr_wcs.c \
-	third_party/icu/source/common/ustrcase.c \
-	third_party/icu/source/common/ustrenum.cpp \
-	third_party/icu/source/common/ustrfmt.c \
-	third_party/icu/source/common/ustring.c \
-	third_party/icu/source/common/ustrtrns.c \
-	third_party/icu/source/common/utext.cpp \
-	third_party/icu/source/common/utf_impl.c \
-	third_party/icu/source/common/util.cpp \
-	third_party/icu/source/common/util_props.cpp \
-	third_party/icu/source/common/utrace.c \
-	third_party/icu/source/common/utrie.c \
-	third_party/icu/source/common/utrie2.cpp \
-	third_party/icu/source/common/utrie2_builder.c \
-	third_party/icu/source/common/uts46.cpp \
-	third_party/icu/source/common/utypes.c \
-	third_party/icu/source/common/uvector.cpp \
-	third_party/icu/source/common/uvectr32.cpp \
-	third_party/icu/source/common/uvectr64.cpp \
-	third_party/icu/source/common/wintz.c
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Debug := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-g \
-	-fomit-frame-pointer \
-	-fdata-sections \
-	-ffunction-sections \
-	-funwind-tables
-
-MY_DEFS_Debug := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=1' \
-	'-DWTF_USE_DYNAMIC_ANNOTATIONS=1' \
-	'-D_DEBUG'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Debug := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Debug := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-# Flags passed to both C and C++ files.
-MY_CFLAGS_Release := \
-	-fstack-protector \
-	--param=ssp-buffer-size=4 \
-	-pthread \
-	-fno-exceptions \
-	-fno-strict-aliasing \
-	-Wno-unused-parameter \
-	-Wno-missing-field-initializers \
-	-fvisibility=hidden \
-	-pipe \
-	-fPIC \
-	-Wno-unused-local-typedefs \
-	-Wno-deprecated-declarations \
-	-Wno-unused-function \
-	-Wno-format \
-	-m64 \
-	-Os \
-	-fno-ident \
-	-fdata-sections \
-	-ffunction-sections \
-	-fomit-frame-pointer \
-	-funwind-tables
-
-MY_DEFS_Release := \
-	'-DU_USING_ICU_NAMESPACE=0' \
-	'-DV8_DEPRECATION_WARNINGS' \
-	'-DBLINK_SCALE_FILTERS_AT_RECORD_TIME' \
-	'-D_FILE_OFFSET_BITS=64' \
-	'-DNO_TCMALLOC' \
-	'-DDISABLE_NACL' \
-	'-DU_STATIC_IMPLEMENTATION' \
-	'-DCHROMIUM_BUILD' \
-	'-DUSE_LIBJPEG_TURBO=1' \
-	'-DENABLE_WEBRTC=1' \
-	'-DUSE_PROPRIETARY_CODECS' \
-	'-DENABLE_BROWSER_CDMS' \
-	'-DENABLE_CONFIGURATION_POLICY' \
-	'-DDISCARDABLE_MEMORY_ALWAYS_SUPPORTED_NATIVELY' \
-	'-DSYSTEM_NATIVELY_SIGNALS_MEMORY_PRESSURE' \
-	'-DENABLE_EGLIMAGE=1' \
-	'-DCLD_VERSION=1' \
-	'-DCLD_DATA_FROM_STATIC' \
-	'-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/"' \
-	'-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' \
-	'-DU_COMMON_IMPLEMENTATION' \
-	'-DUSE_OPENSSL=1' \
-	'-DUSE_OPENSSL_CERTS=1' \
-	'-DNDEBUG' \
-	'-DNVALGRIND' \
-	'-DDYNAMIC_ANNOTATIONS_ENABLED=0'
-
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES_Release := \
-	$(LOCAL_PATH)/third_party/icu/source/common \
-	$(LOCAL_PATH)/third_party/icu/source/i18n \
-	$(gyp_shared_intermediate_dir)
-
-
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS_Release := \
-	-fno-rtti \
-	-fno-threadsafe-statics \
-	-fvisibility-inlines-hidden \
-	-frtti \
-	-Wno-deprecated
-
-
-LOCAL_CFLAGS := $(MY_CFLAGS_$(GYP_CONFIGURATION)) $(MY_DEFS_$(GYP_CONFIGURATION))
-# Undefine ANDROID for host modules
-LOCAL_CFLAGS += -UANDROID
-LOCAL_C_INCLUDES := $(GYP_COPIED_SOURCE_ORIGIN_DIRS) $(LOCAL_C_INCLUDES_$(GYP_CONFIGURATION))
-LOCAL_CPPFLAGS := $(LOCAL_CPPFLAGS_$(GYP_CONFIGURATION))
-LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
-### Rules for final target.
-
-LOCAL_LDFLAGS_Debug := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS_Release := \
-	-Wl,-z,now \
-	-Wl,-z,relro \
-	-pthread \
-	-fPIC \
-	-m64
-
-
-LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION))
-
-LOCAL_STATIC_LIBRARIES :=
-
-# Enable grouping to fix circular references
-LOCAL_GROUP_STATIC_LIBRARIES := true
-
-LOCAL_SHARED_LIBRARIES :=
-
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_$(TARGET_$(GYP_VAR_PREFIX)ARCH)_host_gyp
-
-include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/icuuc.target.darwin-arm.mk b/icuuc.target.darwin-arm.mk
deleted file mode 100644
index 638a3c7..0000000
--- a/icuuc.target.darwin-arm.mk
+++ /dev/null
@@ -1,226 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icuuc_gyp
-LOCAL_MODULE_STEM := icuuc
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icuuc_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icuuc shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/common --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target" unicode/brkiter.h unicode/bytestream.h unicode/caniter.h unicode/chariter.h unicode/dbbi.h unicode/docmain.h unicode/dtintrv.h unicode/errorcode.h unicode/icudataver.h unicode/icuplug.h unicode/idna.h unicode/localpointer.h unicode/locid.h unicode/normalizer2.h unicode/normlzr.h unicode/pandroid.h unicode/parseerr.h unicode/parsepos.h unicode/pfreebsd.h unicode/plinux.h unicode/pmac.h unicode/popenbsd.h unicode/ppalmos.h unicode/ptypes.h unicode/putil.h unicode/pwin32.h unicode/rbbi.h unicode/rep.h unicode/resbund.h unicode/schriter.h unicode/std_string.h unicode/strenum.h unicode/stringpiece.h unicode/symtable.h unicode/ubidi.h unicode/ubrk.h unicode/ucasemap.h unicode/ucat.h unicode/uchar.h unicode/uchriter.h unicode/uclean.h unicode/ucnv_cb.h unicode/ucnv_err.h unicode/ucnv.h unicode/ucnvsel.h unicode/uconfig.h unicode/udata.h unicode/udeprctd.h unicode/udraft.h unicode/uenum.h unicode/uidna.h unicode/uintrnal.h unicode/uiter.h unicode/uloc.h unicode/umachine.h unicode/umisc.h unicode/unifilt.h unicode/unifunct.h unicode/unimatch.h unicode/uniset.h unicode/unistr.h unicode/unorm2.h unicode/unorm.h unicode/uobject.h unicode/uobslete.h unicode/urename.h unicode/urep.h unicode/ures.h unicode/uscript.h unicode/uset.h unicode/usetiter.h unicode/ushape.h unicode/usprep.h unicode/ustring.h unicode/usystem.h unicode/utext.h unicode/utf16.h unicode/utf32.h unicode/utf8.h unicode/utf.h unicode/utf_old.h unicode/utrace.h unicode/utypeinfo.h unicode/utypes.h unicode/uvernum.h unicode/uversion.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icuuc.target.darwin-arm64.mk b/icuuc.target.darwin-arm64.mk
deleted file mode 100644
index 638a3c7..0000000
--- a/icuuc.target.darwin-arm64.mk
+++ /dev/null
@@ -1,226 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icuuc_gyp
-LOCAL_MODULE_STEM := icuuc
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icuuc_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icuuc shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/common --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target" unicode/brkiter.h unicode/bytestream.h unicode/caniter.h unicode/chariter.h unicode/dbbi.h unicode/docmain.h unicode/dtintrv.h unicode/errorcode.h unicode/icudataver.h unicode/icuplug.h unicode/idna.h unicode/localpointer.h unicode/locid.h unicode/normalizer2.h unicode/normlzr.h unicode/pandroid.h unicode/parseerr.h unicode/parsepos.h unicode/pfreebsd.h unicode/plinux.h unicode/pmac.h unicode/popenbsd.h unicode/ppalmos.h unicode/ptypes.h unicode/putil.h unicode/pwin32.h unicode/rbbi.h unicode/rep.h unicode/resbund.h unicode/schriter.h unicode/std_string.h unicode/strenum.h unicode/stringpiece.h unicode/symtable.h unicode/ubidi.h unicode/ubrk.h unicode/ucasemap.h unicode/ucat.h unicode/uchar.h unicode/uchriter.h unicode/uclean.h unicode/ucnv_cb.h unicode/ucnv_err.h unicode/ucnv.h unicode/ucnvsel.h unicode/uconfig.h unicode/udata.h unicode/udeprctd.h unicode/udraft.h unicode/uenum.h unicode/uidna.h unicode/uintrnal.h unicode/uiter.h unicode/uloc.h unicode/umachine.h unicode/umisc.h unicode/unifilt.h unicode/unifunct.h unicode/unimatch.h unicode/uniset.h unicode/unistr.h unicode/unorm2.h unicode/unorm.h unicode/uobject.h unicode/uobslete.h unicode/urename.h unicode/urep.h unicode/ures.h unicode/uscript.h unicode/uset.h unicode/usetiter.h unicode/ushape.h unicode/usprep.h unicode/ustring.h unicode/usystem.h unicode/utext.h unicode/utf16.h unicode/utf32.h unicode/utf8.h unicode/utf.h unicode/utf_old.h unicode/utrace.h unicode/utypeinfo.h unicode/utypes.h unicode/uvernum.h unicode/uversion.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icuuc.target.darwin-mips.mk b/icuuc.target.darwin-mips.mk
deleted file mode 100644
index 638a3c7..0000000
--- a/icuuc.target.darwin-mips.mk
+++ /dev/null
@@ -1,226 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icuuc_gyp
-LOCAL_MODULE_STEM := icuuc
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icuuc_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icuuc shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/common --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target" unicode/brkiter.h unicode/bytestream.h unicode/caniter.h unicode/chariter.h unicode/dbbi.h unicode/docmain.h unicode/dtintrv.h unicode/errorcode.h unicode/icudataver.h unicode/icuplug.h unicode/idna.h unicode/localpointer.h unicode/locid.h unicode/normalizer2.h unicode/normlzr.h unicode/pandroid.h unicode/parseerr.h unicode/parsepos.h unicode/pfreebsd.h unicode/plinux.h unicode/pmac.h unicode/popenbsd.h unicode/ppalmos.h unicode/ptypes.h unicode/putil.h unicode/pwin32.h unicode/rbbi.h unicode/rep.h unicode/resbund.h unicode/schriter.h unicode/std_string.h unicode/strenum.h unicode/stringpiece.h unicode/symtable.h unicode/ubidi.h unicode/ubrk.h unicode/ucasemap.h unicode/ucat.h unicode/uchar.h unicode/uchriter.h unicode/uclean.h unicode/ucnv_cb.h unicode/ucnv_err.h unicode/ucnv.h unicode/ucnvsel.h unicode/uconfig.h unicode/udata.h unicode/udeprctd.h unicode/udraft.h unicode/uenum.h unicode/uidna.h unicode/uintrnal.h unicode/uiter.h unicode/uloc.h unicode/umachine.h unicode/umisc.h unicode/unifilt.h unicode/unifunct.h unicode/unimatch.h unicode/uniset.h unicode/unistr.h unicode/unorm2.h unicode/unorm.h unicode/uobject.h unicode/uobslete.h unicode/urename.h unicode/urep.h unicode/ures.h unicode/uscript.h unicode/uset.h unicode/usetiter.h unicode/ushape.h unicode/usprep.h unicode/ustring.h unicode/usystem.h unicode/utext.h unicode/utf16.h unicode/utf32.h unicode/utf8.h unicode/utf.h unicode/utf_old.h unicode/utrace.h unicode/utypeinfo.h unicode/utypes.h unicode/uvernum.h unicode/uversion.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icuuc.target.darwin-x86.mk b/icuuc.target.darwin-x86.mk
deleted file mode 100644
index 638a3c7..0000000
--- a/icuuc.target.darwin-x86.mk
+++ /dev/null
@@ -1,226 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icuuc_gyp
-LOCAL_MODULE_STEM := icuuc
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icuuc_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icuuc shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/common --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target" unicode/brkiter.h unicode/bytestream.h unicode/caniter.h unicode/chariter.h unicode/dbbi.h unicode/docmain.h unicode/dtintrv.h unicode/errorcode.h unicode/icudataver.h unicode/icuplug.h unicode/idna.h unicode/localpointer.h unicode/locid.h unicode/normalizer2.h unicode/normlzr.h unicode/pandroid.h unicode/parseerr.h unicode/parsepos.h unicode/pfreebsd.h unicode/plinux.h unicode/pmac.h unicode/popenbsd.h unicode/ppalmos.h unicode/ptypes.h unicode/putil.h unicode/pwin32.h unicode/rbbi.h unicode/rep.h unicode/resbund.h unicode/schriter.h unicode/std_string.h unicode/strenum.h unicode/stringpiece.h unicode/symtable.h unicode/ubidi.h unicode/ubrk.h unicode/ucasemap.h unicode/ucat.h unicode/uchar.h unicode/uchriter.h unicode/uclean.h unicode/ucnv_cb.h unicode/ucnv_err.h unicode/ucnv.h unicode/ucnvsel.h unicode/uconfig.h unicode/udata.h unicode/udeprctd.h unicode/udraft.h unicode/uenum.h unicode/uidna.h unicode/uintrnal.h unicode/uiter.h unicode/uloc.h unicode/umachine.h unicode/umisc.h unicode/unifilt.h unicode/unifunct.h unicode/unimatch.h unicode/uniset.h unicode/unistr.h unicode/unorm2.h unicode/unorm.h unicode/uobject.h unicode/uobslete.h unicode/urename.h unicode/urep.h unicode/ures.h unicode/uscript.h unicode/uset.h unicode/usetiter.h unicode/ushape.h unicode/usprep.h unicode/ustring.h unicode/usystem.h unicode/utext.h unicode/utf16.h unicode/utf32.h unicode/utf8.h unicode/utf.h unicode/utf_old.h unicode/utrace.h unicode/utypeinfo.h unicode/utypes.h unicode/uvernum.h unicode/uversion.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icuuc.target.darwin-x86_64.mk b/icuuc.target.darwin-x86_64.mk
deleted file mode 100644
index 638a3c7..0000000
--- a/icuuc.target.darwin-x86_64.mk
+++ /dev/null
@@ -1,226 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icuuc_gyp
-LOCAL_MODULE_STEM := icuuc
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icuuc_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icuuc shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/common --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target" unicode/brkiter.h unicode/bytestream.h unicode/caniter.h unicode/chariter.h unicode/dbbi.h unicode/docmain.h unicode/dtintrv.h unicode/errorcode.h unicode/icudataver.h unicode/icuplug.h unicode/idna.h unicode/localpointer.h unicode/locid.h unicode/normalizer2.h unicode/normlzr.h unicode/pandroid.h unicode/parseerr.h unicode/parsepos.h unicode/pfreebsd.h unicode/plinux.h unicode/pmac.h unicode/popenbsd.h unicode/ppalmos.h unicode/ptypes.h unicode/putil.h unicode/pwin32.h unicode/rbbi.h unicode/rep.h unicode/resbund.h unicode/schriter.h unicode/std_string.h unicode/strenum.h unicode/stringpiece.h unicode/symtable.h unicode/ubidi.h unicode/ubrk.h unicode/ucasemap.h unicode/ucat.h unicode/uchar.h unicode/uchriter.h unicode/uclean.h unicode/ucnv_cb.h unicode/ucnv_err.h unicode/ucnv.h unicode/ucnvsel.h unicode/uconfig.h unicode/udata.h unicode/udeprctd.h unicode/udraft.h unicode/uenum.h unicode/uidna.h unicode/uintrnal.h unicode/uiter.h unicode/uloc.h unicode/umachine.h unicode/umisc.h unicode/unifilt.h unicode/unifunct.h unicode/unimatch.h unicode/uniset.h unicode/unistr.h unicode/unorm2.h unicode/unorm.h unicode/uobject.h unicode/uobslete.h unicode/urename.h unicode/urep.h unicode/ures.h unicode/uscript.h unicode/uset.h unicode/usetiter.h unicode/ushape.h unicode/usprep.h unicode/ustring.h unicode/usystem.h unicode/utext.h unicode/utf16.h unicode/utf32.h unicode/utf8.h unicode/utf.h unicode/utf_old.h unicode/utrace.h unicode/utypeinfo.h unicode/utypes.h unicode/uvernum.h unicode/uversion.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icuuc.target.linux-arm.mk b/icuuc.target.linux-arm.mk
deleted file mode 100644
index 638a3c7..0000000
--- a/icuuc.target.linux-arm.mk
+++ /dev/null
@@ -1,226 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icuuc_gyp
-LOCAL_MODULE_STEM := icuuc
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icuuc_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icuuc shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/common --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target" unicode/brkiter.h unicode/bytestream.h unicode/caniter.h unicode/chariter.h unicode/dbbi.h unicode/docmain.h unicode/dtintrv.h unicode/errorcode.h unicode/icudataver.h unicode/icuplug.h unicode/idna.h unicode/localpointer.h unicode/locid.h unicode/normalizer2.h unicode/normlzr.h unicode/pandroid.h unicode/parseerr.h unicode/parsepos.h unicode/pfreebsd.h unicode/plinux.h unicode/pmac.h unicode/popenbsd.h unicode/ppalmos.h unicode/ptypes.h unicode/putil.h unicode/pwin32.h unicode/rbbi.h unicode/rep.h unicode/resbund.h unicode/schriter.h unicode/std_string.h unicode/strenum.h unicode/stringpiece.h unicode/symtable.h unicode/ubidi.h unicode/ubrk.h unicode/ucasemap.h unicode/ucat.h unicode/uchar.h unicode/uchriter.h unicode/uclean.h unicode/ucnv_cb.h unicode/ucnv_err.h unicode/ucnv.h unicode/ucnvsel.h unicode/uconfig.h unicode/udata.h unicode/udeprctd.h unicode/udraft.h unicode/uenum.h unicode/uidna.h unicode/uintrnal.h unicode/uiter.h unicode/uloc.h unicode/umachine.h unicode/umisc.h unicode/unifilt.h unicode/unifunct.h unicode/unimatch.h unicode/uniset.h unicode/unistr.h unicode/unorm2.h unicode/unorm.h unicode/uobject.h unicode/uobslete.h unicode/urename.h unicode/urep.h unicode/ures.h unicode/uscript.h unicode/uset.h unicode/usetiter.h unicode/ushape.h unicode/usprep.h unicode/ustring.h unicode/usystem.h unicode/utext.h unicode/utf16.h unicode/utf32.h unicode/utf8.h unicode/utf.h unicode/utf_old.h unicode/utrace.h unicode/utypeinfo.h unicode/utypes.h unicode/uvernum.h unicode/uversion.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icuuc.target.linux-arm64.mk b/icuuc.target.linux-arm64.mk
deleted file mode 100644
index 638a3c7..0000000
--- a/icuuc.target.linux-arm64.mk
+++ /dev/null
@@ -1,226 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icuuc_gyp
-LOCAL_MODULE_STEM := icuuc
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icuuc_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icuuc shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/common --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target" unicode/brkiter.h unicode/bytestream.h unicode/caniter.h unicode/chariter.h unicode/dbbi.h unicode/docmain.h unicode/dtintrv.h unicode/errorcode.h unicode/icudataver.h unicode/icuplug.h unicode/idna.h unicode/localpointer.h unicode/locid.h unicode/normalizer2.h unicode/normlzr.h unicode/pandroid.h unicode/parseerr.h unicode/parsepos.h unicode/pfreebsd.h unicode/plinux.h unicode/pmac.h unicode/popenbsd.h unicode/ppalmos.h unicode/ptypes.h unicode/putil.h unicode/pwin32.h unicode/rbbi.h unicode/rep.h unicode/resbund.h unicode/schriter.h unicode/std_string.h unicode/strenum.h unicode/stringpiece.h unicode/symtable.h unicode/ubidi.h unicode/ubrk.h unicode/ucasemap.h unicode/ucat.h unicode/uchar.h unicode/uchriter.h unicode/uclean.h unicode/ucnv_cb.h unicode/ucnv_err.h unicode/ucnv.h unicode/ucnvsel.h unicode/uconfig.h unicode/udata.h unicode/udeprctd.h unicode/udraft.h unicode/uenum.h unicode/uidna.h unicode/uintrnal.h unicode/uiter.h unicode/uloc.h unicode/umachine.h unicode/umisc.h unicode/unifilt.h unicode/unifunct.h unicode/unimatch.h unicode/uniset.h unicode/unistr.h unicode/unorm2.h unicode/unorm.h unicode/uobject.h unicode/uobslete.h unicode/urename.h unicode/urep.h unicode/ures.h unicode/uscript.h unicode/uset.h unicode/usetiter.h unicode/ushape.h unicode/usprep.h unicode/ustring.h unicode/usystem.h unicode/utext.h unicode/utf16.h unicode/utf32.h unicode/utf8.h unicode/utf.h unicode/utf_old.h unicode/utrace.h unicode/utypeinfo.h unicode/utypes.h unicode/uvernum.h unicode/uversion.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icuuc.target.linux-mips.mk b/icuuc.target.linux-mips.mk
deleted file mode 100644
index 638a3c7..0000000
--- a/icuuc.target.linux-mips.mk
+++ /dev/null
@@ -1,226 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icuuc_gyp
-LOCAL_MODULE_STEM := icuuc
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icuuc_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icuuc shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/common --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target" unicode/brkiter.h unicode/bytestream.h unicode/caniter.h unicode/chariter.h unicode/dbbi.h unicode/docmain.h unicode/dtintrv.h unicode/errorcode.h unicode/icudataver.h unicode/icuplug.h unicode/idna.h unicode/localpointer.h unicode/locid.h unicode/normalizer2.h unicode/normlzr.h unicode/pandroid.h unicode/parseerr.h unicode/parsepos.h unicode/pfreebsd.h unicode/plinux.h unicode/pmac.h unicode/popenbsd.h unicode/ppalmos.h unicode/ptypes.h unicode/putil.h unicode/pwin32.h unicode/rbbi.h unicode/rep.h unicode/resbund.h unicode/schriter.h unicode/std_string.h unicode/strenum.h unicode/stringpiece.h unicode/symtable.h unicode/ubidi.h unicode/ubrk.h unicode/ucasemap.h unicode/ucat.h unicode/uchar.h unicode/uchriter.h unicode/uclean.h unicode/ucnv_cb.h unicode/ucnv_err.h unicode/ucnv.h unicode/ucnvsel.h unicode/uconfig.h unicode/udata.h unicode/udeprctd.h unicode/udraft.h unicode/uenum.h unicode/uidna.h unicode/uintrnal.h unicode/uiter.h unicode/uloc.h unicode/umachine.h unicode/umisc.h unicode/unifilt.h unicode/unifunct.h unicode/unimatch.h unicode/uniset.h unicode/unistr.h unicode/unorm2.h unicode/unorm.h unicode/uobject.h unicode/uobslete.h unicode/urename.h unicode/urep.h unicode/ures.h unicode/uscript.h unicode/uset.h unicode/usetiter.h unicode/ushape.h unicode/usprep.h unicode/ustring.h unicode/usystem.h unicode/utext.h unicode/utf16.h unicode/utf32.h unicode/utf8.h unicode/utf.h unicode/utf_old.h unicode/utrace.h unicode/utypeinfo.h unicode/utypes.h unicode/uvernum.h unicode/uversion.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icuuc.target.linux-x86.mk b/icuuc.target.linux-x86.mk
deleted file mode 100644
index 638a3c7..0000000
--- a/icuuc.target.linux-x86.mk
+++ /dev/null
@@ -1,226 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icuuc_gyp
-LOCAL_MODULE_STEM := icuuc
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icuuc_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icuuc shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/common --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target" unicode/brkiter.h unicode/bytestream.h unicode/caniter.h unicode/chariter.h unicode/dbbi.h unicode/docmain.h unicode/dtintrv.h unicode/errorcode.h unicode/icudataver.h unicode/icuplug.h unicode/idna.h unicode/localpointer.h unicode/locid.h unicode/normalizer2.h unicode/normlzr.h unicode/pandroid.h unicode/parseerr.h unicode/parsepos.h unicode/pfreebsd.h unicode/plinux.h unicode/pmac.h unicode/popenbsd.h unicode/ppalmos.h unicode/ptypes.h unicode/putil.h unicode/pwin32.h unicode/rbbi.h unicode/rep.h unicode/resbund.h unicode/schriter.h unicode/std_string.h unicode/strenum.h unicode/stringpiece.h unicode/symtable.h unicode/ubidi.h unicode/ubrk.h unicode/ucasemap.h unicode/ucat.h unicode/uchar.h unicode/uchriter.h unicode/uclean.h unicode/ucnv_cb.h unicode/ucnv_err.h unicode/ucnv.h unicode/ucnvsel.h unicode/uconfig.h unicode/udata.h unicode/udeprctd.h unicode/udraft.h unicode/uenum.h unicode/uidna.h unicode/uintrnal.h unicode/uiter.h unicode/uloc.h unicode/umachine.h unicode/umisc.h unicode/unifilt.h unicode/unifunct.h unicode/unimatch.h unicode/uniset.h unicode/unistr.h unicode/unorm2.h unicode/unorm.h unicode/uobject.h unicode/uobslete.h unicode/urename.h unicode/urep.h unicode/ures.h unicode/uscript.h unicode/uset.h unicode/usetiter.h unicode/ushape.h unicode/usprep.h unicode/ustring.h unicode/usystem.h unicode/utext.h unicode/utf16.h unicode/utf32.h unicode/utf8.h unicode/utf.h unicode/utf_old.h unicode/utrace.h unicode/utypeinfo.h unicode/utypes.h unicode/uvernum.h unicode/uversion.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/icuuc.target.linux-x86_64.mk b/icuuc.target.linux-x86_64.mk
deleted file mode 100644
index 638a3c7..0000000
--- a/icuuc.target.linux-x86_64.mk
+++ /dev/null
@@ -1,226 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_icuuc_gyp
-LOCAL_MODULE_STEM := icuuc
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES := \
-	$(call intermediates-dir-for,GYP,third_party_icu_system_icu_gyp,,,$(GYP_VAR_PREFIX))/system_icu.stamp
-
-### Rules for action "generate_icuuc_shim_headers":
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_local_path := $(LOCAL_PATH)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_var_prefix := $(GYP_VAR_PREFIX)
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_intermediate_dir := $(abspath $(gyp_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: gyp_shared_intermediate_dir := $(abspath $(gyp_shared_intermediate_dir))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: export PATH := $(subst $(ANDROID_BUILD_PATHS),,$(PATH))
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h: $(LOCAL_PATH)/tools/generate_shim_headers/generate_shim_headers.py $(GYP_TARGET_DEPENDENCIES)
-	@echo "Gyp action: Generating icuuc shim headers ($@)"
-	$(hide)cd $(gyp_local_path)/third_party/icu; mkdir -p $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode; python ../../tools/generate_shim_headers/generate_shim_headers.py --headers-root source/common --output-directory "$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target" unicode/brkiter.h unicode/bytestream.h unicode/caniter.h unicode/chariter.h unicode/dbbi.h unicode/docmain.h unicode/dtintrv.h unicode/errorcode.h unicode/icudataver.h unicode/icuplug.h unicode/idna.h unicode/localpointer.h unicode/locid.h unicode/normalizer2.h unicode/normlzr.h unicode/pandroid.h unicode/parseerr.h unicode/parsepos.h unicode/pfreebsd.h unicode/plinux.h unicode/pmac.h unicode/popenbsd.h unicode/ppalmos.h unicode/ptypes.h unicode/putil.h unicode/pwin32.h unicode/rbbi.h unicode/rep.h unicode/resbund.h unicode/schriter.h unicode/std_string.h unicode/strenum.h unicode/stringpiece.h unicode/symtable.h unicode/ubidi.h unicode/ubrk.h unicode/ucasemap.h unicode/ucat.h unicode/uchar.h unicode/uchriter.h unicode/uclean.h unicode/ucnv_cb.h unicode/ucnv_err.h unicode/ucnv.h unicode/ucnvsel.h unicode/uconfig.h unicode/udata.h unicode/udeprctd.h unicode/udraft.h unicode/uenum.h unicode/uidna.h unicode/uintrnal.h unicode/uiter.h unicode/uloc.h unicode/umachine.h unicode/umisc.h unicode/unifilt.h unicode/unifunct.h unicode/unimatch.h unicode/uniset.h unicode/unistr.h unicode/unorm2.h unicode/unorm.h unicode/uobject.h unicode/uobslete.h unicode/urename.h unicode/urep.h unicode/ures.h unicode/uscript.h unicode/uset.h unicode/usetiter.h unicode/ushape.h unicode/usprep.h unicode/ustring.h unicode/usystem.h unicode/utext.h unicode/utf16.h unicode/utf32.h unicode/utf8.h unicode/utf.h unicode/utf_old.h unicode/utrace.h unicode/utypeinfo.h unicode/utypes.h unicode/uvernum.h unicode/uversion.h --generate
-
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h: $(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h ;
-
-
-GYP_GENERATED_OUTPUTS := \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/brkiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/bytestream.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/caniter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/chariter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/docmain.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/dtintrv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/errorcode.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icudataver.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/icuplug.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/idna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/localpointer.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/locid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normalizer2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/normlzr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pandroid.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parseerr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/parsepos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pfreebsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/plinux.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pmac.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/popenbsd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ppalmos.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ptypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/putil.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/pwin32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rbbi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/rep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/resbund.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/schriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/std_string.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/strenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/stringpiece.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/symtable.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubidi.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ubrk.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucasemap.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucat.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchar.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uchriter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uclean.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_cb.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv_err.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnv.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ucnvsel.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uconfig.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udata.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udeprctd.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/udraft.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uenum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uidna.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uintrnal.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uloc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umachine.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/umisc.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifilt.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unifunct.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unimatch.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uniset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unistr.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm2.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/unorm.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobject.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uobslete.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urename.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/urep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ures.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uscript.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uset.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usetiter.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ushape.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usprep.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/ustring.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/usystem.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utext.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf16.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf32.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf8.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utf_old.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utrace.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypeinfo.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/utypes.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uvernum.h \
-	$(gyp_shared_intermediate_dir)/shim_headers/icuuc/target/third_party/icu/source/common/unicode/uversion.h
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_icuuc_gyp
-
-# Alias gyp target name.
-.PHONY: icuuc
-icuuc: third_party_icu_icuuc_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/system_icu.target.darwin-arm.mk b/system_icu.target.darwin-arm.mk
deleted file mode 100644
index ca6bd2c..0000000
--- a/system_icu.target.darwin-arm.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_system_icu_gyp
-LOCAL_MODULE_STEM := system_icu
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_system_icu_gyp
-
-# Alias gyp target name.
-.PHONY: system_icu
-system_icu: third_party_icu_system_icu_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/system_icu.target.darwin-arm64.mk b/system_icu.target.darwin-arm64.mk
deleted file mode 100644
index ca6bd2c..0000000
--- a/system_icu.target.darwin-arm64.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_system_icu_gyp
-LOCAL_MODULE_STEM := system_icu
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_system_icu_gyp
-
-# Alias gyp target name.
-.PHONY: system_icu
-system_icu: third_party_icu_system_icu_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/system_icu.target.darwin-mips.mk b/system_icu.target.darwin-mips.mk
deleted file mode 100644
index ca6bd2c..0000000
--- a/system_icu.target.darwin-mips.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_system_icu_gyp
-LOCAL_MODULE_STEM := system_icu
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_system_icu_gyp
-
-# Alias gyp target name.
-.PHONY: system_icu
-system_icu: third_party_icu_system_icu_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/system_icu.target.darwin-x86.mk b/system_icu.target.darwin-x86.mk
deleted file mode 100644
index ca6bd2c..0000000
--- a/system_icu.target.darwin-x86.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_system_icu_gyp
-LOCAL_MODULE_STEM := system_icu
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_system_icu_gyp
-
-# Alias gyp target name.
-.PHONY: system_icu
-system_icu: third_party_icu_system_icu_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/system_icu.target.darwin-x86_64.mk b/system_icu.target.darwin-x86_64.mk
deleted file mode 100644
index ca6bd2c..0000000
--- a/system_icu.target.darwin-x86_64.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_system_icu_gyp
-LOCAL_MODULE_STEM := system_icu
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_system_icu_gyp
-
-# Alias gyp target name.
-.PHONY: system_icu
-system_icu: third_party_icu_system_icu_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/system_icu.target.linux-arm.mk b/system_icu.target.linux-arm.mk
deleted file mode 100644
index ca6bd2c..0000000
--- a/system_icu.target.linux-arm.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_system_icu_gyp
-LOCAL_MODULE_STEM := system_icu
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_system_icu_gyp
-
-# Alias gyp target name.
-.PHONY: system_icu
-system_icu: third_party_icu_system_icu_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/system_icu.target.linux-arm64.mk b/system_icu.target.linux-arm64.mk
deleted file mode 100644
index ca6bd2c..0000000
--- a/system_icu.target.linux-arm64.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_system_icu_gyp
-LOCAL_MODULE_STEM := system_icu
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_system_icu_gyp
-
-# Alias gyp target name.
-.PHONY: system_icu
-system_icu: third_party_icu_system_icu_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/system_icu.target.linux-mips.mk b/system_icu.target.linux-mips.mk
deleted file mode 100644
index ca6bd2c..0000000
--- a/system_icu.target.linux-mips.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_system_icu_gyp
-LOCAL_MODULE_STEM := system_icu
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_system_icu_gyp
-
-# Alias gyp target name.
-.PHONY: system_icu
-system_icu: third_party_icu_system_icu_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/system_icu.target.linux-x86.mk b/system_icu.target.linux-x86.mk
deleted file mode 100644
index ca6bd2c..0000000
--- a/system_icu.target.linux-x86.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_system_icu_gyp
-LOCAL_MODULE_STEM := system_icu
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_system_icu_gyp
-
-# Alias gyp target name.
-.PHONY: system_icu
-system_icu: third_party_icu_system_icu_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=
diff --git a/system_icu.target.linux-x86_64.mk b/system_icu.target.linux-x86_64.mk
deleted file mode 100644
index ca6bd2c..0000000
--- a/system_icu.target.linux-x86_64.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-# This file is generated by gyp; do not edit.
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE_CLASS := GYP
-LOCAL_MODULE := third_party_icu_system_icu_gyp
-LOCAL_MODULE_STEM := system_icu
-LOCAL_MODULE_SUFFIX := .stamp
-LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE_TARGET_ARCH := $(TARGET_$(GYP_VAR_PREFIX)ARCH)
-gyp_intermediate_dir := $(call local-intermediates-dir,,$(GYP_VAR_PREFIX))
-gyp_shared_intermediate_dir := $(call intermediates-dir-for,GYP,shared,,,$(GYP_VAR_PREFIX))
-
-# Make sure our deps are built first.
-GYP_TARGET_DEPENDENCIES :=
-
-GYP_GENERATED_OUTPUTS :=
-
-# Make sure our deps and generated files are built first.
-LOCAL_ADDITIONAL_DEPENDENCIES := $(GYP_TARGET_DEPENDENCIES) $(GYP_GENERATED_OUTPUTS)
-
-### Rules for final target.
-# Add target alias to "gyp_all_modules" target.
-.PHONY: gyp_all_modules
-gyp_all_modules: third_party_icu_system_icu_gyp
-
-# Alias gyp target name.
-.PHONY: system_icu
-system_icu: third_party_icu_system_icu_gyp
-
-LOCAL_MODULE_PATH := $(PRODUCT_OUT)/gyp_stamp
-LOCAL_UNINSTALLABLE_MODULE := true
-LOCAL_2ND_ARCH_VAR_PREFIX := $(GYP_VAR_PREFIX)
-
-include $(BUILD_SYSTEM)/base_rules.mk
-
-$(LOCAL_BUILT_MODULE): $(LOCAL_ADDITIONAL_DEPENDENCIES)
-	$(hide) echo "Gyp timestamp: $@"
-	$(hide) mkdir -p $(dir $@)
-	$(hide) touch $@
-
-LOCAL_2ND_ARCH_VAR_PREFIX :=