diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-08-03 08:51:59 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-08-03 08:52:38 +0300 |
| commit | f1e95bd6d9a115845b38c523fd57e7ee1a0e282e (patch) | |
| tree | 9bbfca8cac0a282a1b34f9df1c07f53ee630a2cb /android | |
| parent | 2d757306e220b78e7f1ef28d7256e51c7edc4e40 (diff) | |
Adapt r8b bits from ../DocumentLoader/Makefile
Change-Id: Idd60d2dd5cb32012de6027c2c161e2dbc3b2f404
Diffstat (limited to 'android')
| -rw-r--r-- | android/experimental/LibreOffice4Android/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index da87ca78c669..bcf0d018ba9a 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -139,7 +139,7 @@ copy-stuff: done # # Then the shared GNU C++ library - $(call COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/$(ABI_PATH)/libgnustl_shared.so) + $(call COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/$(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR)libs/$(ABI_PATH)/libgnustl_shared.so) # # Then other "assets". Let the directory structure under assets mimic # that under solver for now. @@ -238,7 +238,7 @@ copy-stuff: # # Then gdbserver and gdb.setup so that we can debug with ndk-gdb. # - cp $(ANDROID_NDK_HOME)/toolchains/arm-linux-androideabi-4.4.3/prebuilt/gdbserver $(SODEST) + cp $(ANDROID_NDK_GDBSERVER) $(SODEST) echo set solib-search-path ./obj/local/$(ABI_PATH) >$(SODEST)/gdb.setup build-ant: copy-stuff properties @@ -274,4 +274,4 @@ run: clean: properties $(ANT) clean - rm -rf assets libs obj + rm -rf assets libs $(SODEST) $(OBJLOCAL) |