mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Adapt architecture-specific bits from ../LibreOffice4Android/Makefile

Browse Source 
Change-Id: I06ecb06df4df61fccc53477b5789a171e62248ec
This commit is contained in:
Tor Lillqvist
2012-08-03 08:51:22 +03:00
parent 46305229cc
commit 2d757306e2
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
android/experimental/DocumentLoader/Makefile
View File

@@ -16,8 +16,13 @@ APP_PACKAGE=org.libreoffice.android.examples
# code are very much self-contained pre-packaged thingies. # code are very much self-contained pre-packaged thingies.
APP_DATA_PATH=/data/data/$(APP_PACKAGE) APP_DATA_PATH=/data/data/$(APP_PACKAGE)
SODEST=libs/armeabi-v7a ifeq ($(CPU),I)
OBJLOCAL=obj/local/armeabi-v7a ABI_PATH=x86
else
ABI_PATH=armeabi-v7a
endif
SODEST=libs/$(ABI_PATH)
OBJLOCAL=obj/local/$(ABI_PATH)
define COPYSO define COPYSO
cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1))) && \ cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1))) && \
@@ -34,10 +39,10 @@ all: build-ant
properties: properties:
echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties echo sdk.dir=$(ANDROID_SDK_HOME) >local.properties
echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties echo sdk.dir=$(ANDROID_SDK_HOME) >../../Bootstrap/local.properties
copy-stuff: copy-stuff:
# First always clean # First always clean
rm -rf libs $(OBJLOCAL) rm -rf libs $(OBJLOCAL)
mkdir -p $(SODEST) $(OBJLOCAL) mkdir -p $(SODEST) $(OBJLOCAL)
# #
@@ -134,7 +139,7 @@ copy-stuff:
done done
# #
# Then the shared GNU C++ library # Then the shared GNU C++ library
$(call COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/$(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR)libs/armeabi-v7a/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 # Then other "assets". Let the directory structure under assets mimic
# that under solver for now. # that under solver for now.
@@ -234,7 +239,7 @@ copy-stuff:
# Then gdbserver and gdb.setup so that we can debug with ndk-gdb. # Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
# #
cp $(ANDROID_NDK_GDBSERVER) $(SODEST) cp $(ANDROID_NDK_GDBSERVER) $(SODEST)
echo set solib-search-path ./obj/local/armeabi-v7a >$(SODEST)/gdb.setup echo set solib-search-path ./obj/local/$(ABI_PATH) >$(SODEST)/gdb.setup
build-ant: copy-stuff properties build-ant: copy-stuff properties
# #