import cl @39954

19 files changed, 20 insertions, 20 deletions

diff --git a/tools/ctestfw/Makefile b/tools/ctestfw/Makefile
index 69ff3799..7a47b441 100644
--- a/tools/ctestfw/Makefile
+++ b/tools/ctestfw/Makefile
@@ -14,7 +14,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_STATIC_LIBRARIES := libicutu libicui18n libicuuc
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/genbidi/Makefile b/tools/genbidi/Makefile
index ebe6ed61..cec8b9b0 100644
--- a/tools/genbidi/Makefile
+++ b/tools/genbidi/Makefile
@@ -12,7 +12,7 @@ LOCAL_C_INCLUDES +=            \
 
 LOCAL_STATIC_LIBRARIES += libicuuc libicudata libicui18n libicutu
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl -licudata
 endif
 
diff --git a/tools/genbrk/Makefile b/tools/genbrk/Makefile
index 4c8dec74..42609238 100644
--- a/tools/genbrk/Makefile
+++ b/tools/genbrk/Makefile
@@ -11,7 +11,7 @@ LOCAL_C_INCLUDES +=            \
 
 LOCAL_STATIC_LIBRARIES := libicutu libicuuc libicudata libicui18n
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/gencase/Makefile b/tools/gencase/Makefile
index 8f2f7ddd..f9651c5e 100644
--- a/tools/gencase/Makefile
+++ b/tools/gencase/Makefile
@@ -6,7 +6,7 @@ LOCAL_SRC_FILES := gencase.c store.c
 
 LOCAL_STATIC_LIBRARIES := libicutu libicuuc libicudata libicui18n
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/genccode/Makefile b/tools/genccode/Makefile
index 7b41ed46..482cd3b5 100644
--- a/tools/genccode/Makefile
+++ b/tools/genccode/Makefile
@@ -11,7 +11,7 @@ LOCAL_C_INCLUDES +=            \
 
 LOCAL_STATIC_LIBRARIES := libicutu libicuuc libicui18n
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/gencmn/Makefile b/tools/gencmn/Makefile
index 78052c61..ed7ddca3 100644
--- a/tools/gencmn/Makefile
+++ b/tools/gencmn/Makefile
@@ -6,7 +6,7 @@ LOCAL_SRC_FILES := gencmn.c
 
 LOCAL_STATIC_LIBRARIES := libicutu libicuuc libicui18n
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/gencnval/Makefile b/tools/gencnval/Makefile
index 36d1a269..706d6d41 100644
--- a/tools/gencnval/Makefile
+++ b/tools/gencnval/Makefile
@@ -11,7 +11,7 @@ LOCAL_C_INCLUDES +=            \
 
 LOCAL_STATIC_LIBRARIES := libicutu libicuuc libicudata libicui18n
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/genctd/Makefile b/tools/genctd/Makefile
index cd600f0d..f7ef6f8a 100644
--- a/tools/genctd/Makefile
+++ b/tools/genctd/Makefile
@@ -6,7 +6,7 @@ LOCAL_SRC_FILES := genctd.cpp
 
 LOCAL_STATIC_LIBRARIES := libicutu libicuuc libicudata
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/gennames/Makefile b/tools/gennames/Makefile
index 3825eb9c..49b0d406 100644
--- a/tools/gennames/Makefile
+++ b/tools/gennames/Makefile
@@ -11,7 +11,7 @@ LOCAL_C_INCLUDES +=            \
 
 LOCAL_STATIC_LIBRARIES := libicutu libicuuc libicudata libicui18n
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/gennorm/Makefile b/tools/gennorm/Makefile
index e7f4051b..7561c166 100644
--- a/tools/gennorm/Makefile
+++ b/tools/gennorm/Makefile
@@ -6,7 +6,7 @@ LOCAL_SRC_FILES := gennorm.c store.c
 
 LOCAL_STATIC_LIBRARIES := libicutu libicuuc libicudata libicui18n
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/genpname/Makefile b/tools/genpname/Makefile
index ee7ba07e..5e778802 100644
--- a/tools/genpname/Makefile
+++ b/tools/genpname/Makefile
@@ -9,7 +9,7 @@ LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH)/../toolutil \
 	$(LOCAL_PATH)/../../common
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/genprops/Makefile b/tools/genprops/Makefile
index 02b319a1..eadf2ace 100644
--- a/tools/genprops/Makefile
+++ b/tools/genprops/Makefile
@@ -6,7 +6,7 @@ LOCAL_SRC_FILES := genprops.c props2.c store.c
 
 LOCAL_STATIC_LIBRARIES := libicutu libicuuc libicudata libicui18n
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/genrb/Makefile b/tools/genrb/Makefile
index a4577544..e7c6d36b 100644
--- a/tools/genrb/Makefile
+++ b/tools/genrb/Makefile
@@ -18,7 +18,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_STATIC_LIBRARIES := libicui18n libicuuc libicudata libicutu
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
@@ -43,7 +43,7 @@ LOCAL_SRC_FILES := \
 
 LOCAL_STATIC_LIBRARIES := libicui18n libicuuc libicudata libicutu
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/gensprep/Makefile b/tools/gensprep/Makefile
index 27e617ee..addc304a 100644
--- a/tools/gensprep/Makefile
+++ b/tools/gensprep/Makefile
@@ -6,7 +6,7 @@ LOCAL_SRC_FILES := gensprep.c store.c
 
 LOCAL_STATIC_LIBRARIES := libicutu libicuuc libicui18n
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/genuca/Makefile b/tools/genuca/Makefile
index 6a41ebd4..b4ff1a4f 100644
--- a/tools/genuca/Makefile
+++ b/tools/genuca/Makefile
@@ -6,7 +6,7 @@ LOCAL_SRC_FILES := genuca.cpp
 
 LOCAL_STATIC_LIBRARIES := libicutu libicui18n libicuuc libicudata
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/icupkg/Makefile b/tools/icupkg/Makefile
index 44f735b2..4193680e 100644
--- a/tools/icupkg/Makefile
+++ b/tools/icupkg/Makefile
@@ -11,7 +11,7 @@ LOCAL_C_INCLUDES +=            \
 
 LOCAL_STATIC_LIBRARIES := libicutu libicuuc libicudata libicui18n
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/icuswap/Makefile b/tools/icuswap/Makefile
index c3de597c..d1376a40 100644
--- a/tools/icuswap/Makefile
+++ b/tools/icuswap/Makefile
@@ -11,7 +11,7 @@ LOCAL_C_INCLUDES +=            \
 
 LOCAL_STATIC_LIBRARIES := libicutu libicuuc libicudata libicui18n
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/makeconv/Makefile b/tools/makeconv/Makefile
index c9a97116..617dc7a6 100644
--- a/tools/makeconv/Makefile
+++ b/tools/makeconv/Makefile
@@ -12,7 +12,7 @@ LOCAL_C_INCLUDES +=            \
 
 LOCAL_STATIC_LIBRARIES := libicutu libicuuc libicui18n
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif
 
diff --git a/tools/pkgdata/Makefile b/tools/pkgdata/Makefile
index 66f30131..22654568 100644
--- a/tools/pkgdata/Makefile
+++ b/tools/pkgdata/Makefile
@@ -24,7 +24,7 @@ LOCAL_C_INCLUDES +=            \
 
 LOCAL_STATIC_LIBRARIES := libicutu libicui18n libicuuc
 
-ifneq ($(DEVICE_ARCH),arm)
+ifneq ($(TARGET_ARCH),arm)
 LOCAL_LDLIBS += -lpthread -ldl
 endif