summaryrefslogtreecommitdiff
path: root/android
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-09-19 00:08:31 +0200
committerMichael Stahl <mstahl@redhat.com>2013-09-22 11:08:32 +0200
commitf2899508b3bd55ecdbd45a02e0e8071b95906b3a (patch)
tree061ab2746bbebb6ffff3fd1ecf845292c860a0bc /android
parent4c51feb06e9ee9be25eca5ae58d07cd6c12bca63 (diff)
gbuild: remove executables from OUTDIR and WORKDIR
Call and link executables directly in INSTDIR. - gb_Library_get_target is now same as the gb_LinkTarget_get_target - disable gb_Library_add_auxtarget, no auxtargets need to be copied - adjust paths of all external executables to OUTDIR_FOR_BUILD for now - use lazy assignment instead of := in AllLangResTarget because it's read before Executable - link.exe generates an import library for lots of executables because they export symbols, especially since commit 0ffab9363d527d55b12b9b09d7136ca1c9d171e0 "force 'main' to always be DLLPUBLIC." Change-Id: I3e1ee7425dd430bb83c7cd59e265869a0541b38d
Diffstat (limited to 'android')
-rw-r--r--android/sdremote/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index 78b89eb9bc8e..740c6f6c3699 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -38,8 +38,8 @@ $(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 &&\
- $(OUTDIR_FOR_BUILD)/bin/stringex -i res/values/strings.xml -o res/values-$(1)/strings.xml -m translations-$(1).db -l $(1), \
- $(OUTDIR_FOR_BUILD)/bin/stringex -i res/values/strings.xml -o res/values-$(1)/strings.xml -m -l $(1))
+ $(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))
endef