diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-21 16:31:57 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2011-11-21 18:21:46 +0200 |
| commit | edda1f9a34e23c0087e1d4f7cf21f60fbd76f070 (patch) | |
| tree | feffb66e5efae6277b3ef2fcb765bc8f2f52c6d1 /sal | |
| parent | 4b294b2c20aa78b2c70cb71d503195eb5479159c (diff) | |
Bah, don't bother with conditional copying of stuff into the .apk here
You are not expected to be make'ing here without knowing what you are
doing anyway. Just unconditionally require the stuff needed by the
sample cppunit tests mentioned on the last lines.
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/android/Makefile | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/sal/osl/android/Makefile b/sal/osl/android/Makefile index 940e100c032d..e7d6c6798486 100644 --- a/sal/osl/android/Makefile +++ b/sal/osl/android/Makefile @@ -10,10 +10,6 @@ arm-linux-androideabi-strip --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1 cp $(1) $(OBJLOCAL)$(if $(2),/$(2)) endef -define CONDCOPY -test -f $(1) && $(call COPY,$(1),$(2)) -endef - # The default target just builds all: ndk-build unset JAVA_HOME && ant debug @@ -44,11 +40,11 @@ ndk-build: # this, these might not have been built yet. # for F in $(SRC_ROOT)/cppu/$(INPATH)/lib/qa_*.so; do \ - $(call CONDCOPY,$${F},`basename $${F}`); \ + $(call COPY,$${F},`basename $${F}`); \ done # for F in i18npool_test_breakiterator; do \ - $(call CONDCOPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \ + $(call COPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \ done # @@ -78,7 +74,7 @@ ndk-build: xmlreader \ bootstrap.uno \ i18npool.uno); do \ - $(call CONDCOPY,$(OUTDIR)/lib/lib$${F}.so); \ + $(call COPY,$(OUTDIR)/lib/lib$${F}.so); \ done # # Then the shared GNU C++ library |