summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorAndras Timar <andras.timar@collabora.com>2013-11-15 13:20:07 +0100
committerAndras Timar <andras.timar@collabora.com>2013-11-15 13:34:01 +0100
commit96e23cb9305da8b00db2587104932ee9d5d3122c (patch)
treecde99c219a0808e3b278300e8635f8777c599c95 /android
parent1cd032658648b597d7f89b3098a40606f674ce41 (diff)
fix Makefile of Android Impress Remote
it is not part of gbuild system qtz does not build Change-Id: I46fb43d21255df76775a2d7e30950bf519c58526
Diffstat (limited to 'android')
-rw-r--r--android/sdremote/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index 740c6f6c3699..c480bccc3ebe 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -10,6 +10,10 @@ ifeq ($(BUILDDIR),)
include ../../config_host.mk
endif
+STRINGEX_EXECUTABLE := $(WORKDIR_FOR_BUILD)/LinkTarget/Executable/stringex
+STRINGEX_LDPATH := LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}$(INSTROOT_FOR_BUILD)/$(LIBO_URE_LIB_FOLDER_FOR_BUILD):$(INSTROOT_FOR_BUILD)/$(LIBO_LIB_FOLDER_FOR_BUILD)
+STRINGEX_COMMAND := $(STRINGEX_LDPATH) $(STRINGEX_EXECUTABLE)
+
all: properties translations.done
mkdir -p ../abs-lib/libs
cp $(ANDROID_SDK_HOME)/extras/android/support/v4/android-support-v4.jar ../abs-lib/libs
@@ -36,10 +40,8 @@ endef
define android_translation_rules
$(call android_get_po,$(1)):
mkdir -p res/values-$(1)
- $(if $(filter-out qtz,$(1)), \
- echo $(SRCDIR)/translations/source/$(1)/android/sdremote/res/values.po > translations-$(1).db &&\
- $(gb_Executable_BINDIR_FOR_BUILD)/stringex -i res/values/strings.xml -o res/values-$(1)/strings.xml -m translations-$(1).db -l $(1), \
- $(gb_Executable_BINDIR_FOR_BUILD)/stringex -i res/values/strings.xml -o res/values-$(1)/strings.xml -m -l $(1))
+ echo $(SRCDIR)/translations/source/$(1)/android/sdremote/res/values.po > translations-$(1).db &&\
+ $(STRINGEX_COMMAND) -i res/values/strings.xml -o res/values-$(1)/strings.xml -m translations-$(1).db -l $(1)
endef
@@ -48,7 +50,7 @@ $(foreach lang,$(1),$(call android_translation_rules,$(lang)))
endef
define android_get_langlist
-$(foreach lang,$(filter-out en-US sat sid mai ast mni brx dgo nso kok,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
+$(foreach lang,$(filter-out en-US sat sid mai ast mni brx dgo nso kok qtz,$(WITH_LANG_LIST)),$(subst -,-r,$(lang)))
endef
$(eval $(call android_translations_rules,$(call android_get_langlist)))