diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-08-23 12:26:52 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-08-23 12:28:59 +0300 |
| commit | c02e838ec21408cd5ba70e0e7b53309411d49db2 (patch) | |
| tree | 78b234861752bd7741e77be3e80d7a4ed2833de8 /android/experimental | |
| parent | 6737f12e0a4a10a591dcc780de586f205e094f2f (diff) | |
Factor out the Android APP_ABI sanely instead of copy-paste galore
Change-Id: I66e97d73c410ac6f2e481ba9b2b22183f57438bd
Diffstat (limited to 'android/experimental')
| -rw-r--r-- | android/experimental/DocumentLoader/Makefile | 17 | ||||
| -rw-r--r-- | android/experimental/LibreOffice4Android/Makefile | 8 |
2 files changed, 10 insertions, 15 deletions
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile index 917004a23a68..804d91562ed7 100644 --- a/android/experimental/DocumentLoader/Makefile +++ b/android/experimental/DocumentLoader/Makefile @@ -16,13 +16,8 @@ APP_PACKAGE=org.libreoffice.android.examples # code are very much self-contained pre-packaged thingies. APP_DATA_PATH=/data/data/$(APP_PACKAGE) -ifeq ($(CPU),I) -ABI_PATH=x86 -else -ABI_PATH=armeabi-v7a -endif -SODEST=libs/$(ABI_PATH) -OBJLOCAL=obj/local/$(ABI_PATH) +SODEST=libs/$(ANDROID_APP_ABI) +OBJLOCAL=obj/local/$(ANDROID_APP_ABI) define COPYSO cp $(1) $(SODEST)$(if $(2),/$(2)) && $(STRIP) --strip-debug $(SODEST)$(if $(2),/$(2),/$(notdir $(1))) && \ @@ -47,9 +42,9 @@ copy-stuff: mkdir -p $(SODEST) $(OBJLOCAL) # # Copy shared libraries (including UNO components) we need to -# libs/armeabi-v7a so that ant will include them in the .apk. +# libs/$(ANDROID_APP_ABI) so that ant will include them in the .apk. # -# Copy them to obj/local/armeabi-v7a, too, where gdb will look for +# Copy them to obj/local/$(ANDROID_APP_ABI), too, where gdb will look for # them. # for F in $(strip \ @@ -135,7 +130,7 @@ copy-stuff: done # # Then the shared GNU C++ library - $(call COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/$(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR)libs/$(ABI_PATH)/libgnustl_shared.so) + $(call COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/$(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR)libs/$(ANDROID_APP_ABI)/libgnustl_shared.so) # # Then other "assets". Let the directory structure under assets mimic # that under solver for now. @@ -235,7 +230,7 @@ copy-stuff: # Then gdbserver and gdb.setup so that we can debug with ndk-gdb. # cp $(ANDROID_NDK_GDBSERVER) $(SODEST) - echo set solib-search-path ./obj/local/$(ABI_PATH) >$(SODEST)/gdb.setup + echo set solib-search-path ./obj/local/$(ANDROID_APP_ABI) >$(SODEST)/gdb.setup build-ant: copy-stuff properties # diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile index bb2c02eb2493..837f930b7cc2 100644 --- a/android/experimental/LibreOffice4Android/Makefile +++ b/android/experimental/LibreOffice4Android/Makefile @@ -14,9 +14,9 @@ copy-stuff: mkdir -p $(SODEST) $(OBJLOCAL) # # Copy shared libraries (including UNO components) we need to -# libs/armeabi-v7a so that ant will include them in the .apk. +# libs/$(ANDROID_APP_ABI) so that ant will include them in the .apk. # -# Copy them to obj/local/armeabi-v7a, too, where gdb will look for +# Copy them to obj/local/$(ANDROID_APP_ABI), too, where gdb will look for # them. # for F in $(strip \ @@ -114,7 +114,7 @@ copy-stuff: done # # Then the shared GNU C++ library - $(call COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/$(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR)libs/$(ABI_PATH)/libgnustl_shared.so) + $(call COPYSO,$(ANDROID_NDK_HOME)/sources/cxx-stl/gnu-libstdc++/$(ANDROID_NDK_TOOLCHAIN_VERSION_SUBDIR)libs/$(ANDROID_APP_ABI)/libgnustl_shared.so) # # Then other "assets". Let the directory structure under assets mimic # that under solver for now. @@ -214,7 +214,7 @@ copy-stuff: # Then gdbserver and gdb.setup so that we can debug with ndk-gdb. # cp $(ANDROID_NDK_GDBSERVER) $(SODEST) - echo set solib-search-path ./obj/local/$(ABI_PATH) >$(SODEST)/gdb.setup + echo set solib-search-path ./obj/local/$(ANDROID_APP_ABI) >$(SODEST)/gdb.setup build-ant: copy-stuff properties echo sdk.dir=$(ANDROID_SDK_HOME) >../../abs-lib/local.properties |