diff options
author | Tor Lillqvist <tml@iki.fi> | 2012-07-31 09:53:58 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-07-31 09:55:08 +0300 |
commit | 963f417fa89746fe087f7b7e585edb79fdd3b14d (patch) | |
tree | 5c79869a9c5518f4a3f8fdcff82144a735e4f08f /android | |
parent | 6e6564e60605dded9b0514b82c168e7f88f6e7db (diff) |
More NDK r8b adaptation
Change-Id: Ic65795a1b7bfe0435292f87f27ae39e2c3069fed
Diffstat (limited to 'android')
-rw-r--r-- | android/experimental/DocumentLoader/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 94233369b0e2..cdbf196a9b52 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -134,7 +134,7 @@ copy-stuff: done # # Then the shared GNU C++ library - $(call COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/libgnustl_shared.so) + $(call COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/$(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR)libs/armeabi-v7a/libgnustl_shared.so) # # Then other "assets". Let the directory structure under assets mimic # that under solver for now. @@ -233,7 +233,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/armeabi-v7a >$(SODEST)/gdb.setup build-ant: copy-stuff properties |