commit 547069b8762ab0ce3f69329b67c34e0412c89c81
author Jean-Baptiste Queru <jbq@google.com> Fri Jul 17 18:35:20 2009 -0700
committer Jean-Baptiste Queru <jbq@google.com> Fri Jul 17 18:35:20 2009 -0700
tree 69d2122ed747a8bb266c58a6ac6e5476b4c544d3
parent 51b12d5cb11579d53860272cb236058742cc6601

import commit 8d2b1a83d6b5552c41ffb0aa6e6b8d8c9622626c

stubdata/Android.mk

diff --git a/stubdata/Android.mk b/stubdata/Android.mk
index fd773c2..4418eb7 100644
--- a/stubdata/Android.mk
+++ b/stubdata/Android.mk
@@ -44,14 +44,14 @@
 # US has only EN and ES
 
 
-config := $(or \
-            $(if $(findstring ja,$(PRODUCT_LOCALES)),us-japan), \
-            $(if $(findstring it,$(PRODUCT_LOCALES)),us-euro), \
-            $(if $(findstring pl,$(PRODUCT_LOCALES)),us-euro), \
-            $(if $(findstring cs,$(PRODUCT_LOCALES)),default), \
-            $(if $(findstring de,$(PRODUCT_LOCALES)),default), \
-            $(if $(findstring fr,$(PRODUCT_LOCALES)),default), \
-            $(if $(findstring nl,$(PRODUCT_LOCALES)),default), \
+config := $(word 1, \
+            $(if $(findstring ja,$(PRODUCT_LOCALES)),us-japan) \
+            $(if $(findstring it,$(PRODUCT_LOCALES)),us-euro) \
+            $(if $(findstring pl,$(PRODUCT_LOCALES)),us-euro) \
+            $(if $(findstring cs,$(PRODUCT_LOCALES)),default) \
+            $(if $(findstring de,$(PRODUCT_LOCALES)),default) \
+            $(if $(findstring fr,$(PRODUCT_LOCALES)),default) \
+            $(if $(findstring nl,$(PRODUCT_LOCALES)),default) \
             us)
 
 icu_var_name := icudt38_dat