diff options
| -rw-r--r-- | android/qa/sc/Makefile | 12 | ||||
| -rw-r--r-- | android/qa/simple/Makefile | 20 | ||||
| -rw-r--r-- | configure.in | 1 | ||||
| -rw-r--r-- | vcl/headless/svpdummies.cxx | 6 |
4 files changed, 15 insertions, 24 deletions
diff --git a/android/qa/sc/Makefile b/android/qa/sc/Makefile index 22d4ebafea31..d02379111fcd 100644 --- a/android/qa/sc/Makefile +++ b/android/qa/sc/Makefile @@ -1,3 +1,5 @@ +include ../../../config_host.mk + # The package of this app APP_PACKAGE=org.libreoffice.android.qa.sc @@ -9,15 +11,11 @@ BOOTSTRAP=org.libreoffice.android.Bootstrap APP_DATA_PATH=/data/data/$(APP_PACKAGE) -NDK_HOME:=$(shell type -p ndk-build) -NDK_HOME:=$(shell dirname $(NDK_HOME)) - SODEST=libs/armeabi-v7a OBJLOCAL=obj/local/armeabi-v7a define COPY -cp $(1) $(SODEST)$(if $(2),/$(2)) && \ -arm-linux-androideabi-strip --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1))) && \ +cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1))) && \ cp $(1) $(OBJLOCAL)$(if $(2),/$(2)) endef @@ -118,7 +116,7 @@ copy-stuff: done # # Then the shared GNU C++ library - $(call COPY,$(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so) + $(call COPY,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so) # # Then other "assets" that can be left in the .apk. Let the directory # structure under assets mimic that under solver or workdir for now. @@ -149,7 +147,7 @@ copy-stuff: # # Then gdbserver and gdb.setup so that we can debug with ndk-gdb. # - cp $(NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver $(SODEST) + cp $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver $(SODEST) echo set solib-search-path ./obj/local/armeabi-v7a >$(SODEST)/gdb.setup diff --git a/android/qa/simple/Makefile b/android/qa/simple/Makefile index a98250ba1b47..70fb5c62cc2d 100644 --- a/android/qa/simple/Makefile +++ b/android/qa/simple/Makefile @@ -1,3 +1,5 @@ +include ../../../config_host.mk + # The package of this app APP_PACKAGE=org.libreoffice.android.qa @@ -9,15 +11,11 @@ BOOTSTRAP=org.libreoffice.android.Bootstrap APP_DATA_PATH=/data/data/$(APP_PACKAGE) -NDK_HOME:=$(shell type -p ndk-build) -NDK_HOME:=$(shell dirname $(NDK_HOME)) - SODEST=libs/armeabi-v7a OBJLOCAL=obj/local/armeabi-v7a define COPY -cp $(1) $(SODEST)$(if $(2),/$(2)) && \ -arm-linux-androideabi-strip --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1))) && \ +cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1))) && \ cp $(1) $(OBJLOCAL)$(if $(2),/$(2)) endef @@ -47,17 +45,13 @@ copy-stuff: # # cppunit "plug-ins", first ones from sal # - $(call COPY,$(SRCDIR)/sal/$(INPATH)/lib/*.so) + $(call COPY,$(OUTDIR)/lib/libuno_sal*.so) # # and ones from other modules. Note that depending on when you try # this, these might not have been built yet. # - for F in $(SRC_ROOT)/cppu/$(INPATH)/lib/qa_*.so; do \ - $(call COPY,$${F},`basename $${F}`); \ - done -# - for F in i18npool_test_breakiterator; do \ - $(call COPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}.so); \ + for F in i18npool_test_breakiterator cppu cppuhelper sal; do \ + $(call COPY,$(WORKDIR)/LinkTarget/CppunitTest/libtest_$${F}*.so); \ done # # Other "programs" @@ -90,7 +84,7 @@ copy-stuff: done # # Then the shared GNU C++ library - $(call COPY,$(NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so) + $(call COPY,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so) # # bridgetest components, not in solver for F in bridgetest constructors cppobj; do \ diff --git a/configure.in b/configure.in index 638a0fdfb60e..24d66528bc46 100644 --- a/configure.in +++ b/configure.in @@ -104,6 +104,7 @@ if test "z$with_android_ndk" != "z"; then test -z "$STRIP" && STRIP=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-strip test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a" test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++ --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include -I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include -L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a -fexceptions -frtti" +# PATH="$ANDROID_NDK_HOME/:$PATH" fi AC_SUBST(ANDROID_NDK_HOME) diff --git a/vcl/headless/svpdummies.cxx b/vcl/headless/svpdummies.cxx index 47f6875b1921..ae5c9cd09577 100644 --- a/vcl/headless/svpdummies.cxx +++ b/vcl/headless/svpdummies.cxx @@ -91,10 +91,8 @@ rtl::OUString SvpSalSystem::GetDisplayScreenName( unsigned int nScreen ) return aBuf.makeStringAndClear(); } -int SvpSalSystem::ShowNativeDialog( const rtl::OUString& rTitle, - const rtl::OUString& rMessage, - const std::list< rtl::OUString >& rButtons, - int nDefButton ) +int SvpSalSystem::ShowNativeDialog( const rtl::OUString&, const rtl::OUString&, + const std::list< rtl::OUString >&, int ) { return 0; } |