Index: mobile/android/base/locales/Makefile.in |
diff --git a/mobile/android/base/locales/Makefile.in b/mobile/android/base/locales/Makefile.in |
index 7851f5ad89e0035833584fb811c5187f4d34e15d..cb2ccb269a30d847dee16c20251f4d8c8a1dca2b 100644 |
--- a/mobile/android/base/locales/Makefile.in |
+++ b/mobile/android/base/locales/Makefile.in |
@@ -15,6 +15,9 @@ SEARCHSTRINGSPATH = $(abspath $(call MERGE_FILE,search_strings.dtd)) |
SYNCSTRINGSPATH = $(abspath $(call MERGE_FILE,sync_strings.dtd)) |
STRINGSPATH = $(abspath $(call MERGE_FILE,android_strings.dtd)) |
+ABBSTRINGSPATH = $(or $(wildcard $(srcdir)/abb/$(ABr_CD)/android_strings.dtd), \ |
+ $(wildcard $(srcdir)/abb/$(AB_CD)/android_strings.dtd), \ |
+ $(srcdir)/abb/en-US/android_strings.dtd) |
ifeq (,$(XPI_NAME)) |
BRANDPATH = $(abspath $(DEPTH)/dist/bin/chrome/$(AB_CD)/locale/branding/brand.dtd) |
else |
@@ -67,6 +70,7 @@ strings-xml-preqs =\ |
$(strings-xml-in) \ |
$(BRANDPATH) \ |
$(STRINGSPATH) \ |
+ $(ABBSTRINGSPATH) \ |
$(SEARCHSTRINGSPATH) \ |
$(SYNCSTRINGSPATH) \ |
$(BOOKMARKSPATH) \ |
@@ -86,6 +90,7 @@ $(dir-strings-xml)/strings.xml: $(strings-xml-preqs) |
-DMOZ_ANDROID_SHARED_FXACCOUNT_TYPE=$(MOZ_ANDROID_SHARED_FXACCOUNT_TYPE) \ |
-DMOZ_APP_DISPLAYNAME='@MOZ_APP_DISPLAYNAME@' \ |
-DSTRINGSPATH='$(STRINGSPATH)' \ |
+ -DABBSTRINGSPATH='$(ABBSTRINGSPATH)' \ |
-DSYNCSTRINGSPATH='$(SYNCSTRINGSPATH)' \ |
-DSEARCHSTRINGSPATH='$(SEARCHSTRINGSPATH)' \ |
$< \ |