android/qa/desktop/Makefile | 16 +++++------
configure.in | 59 +++++++++++++++++++++++++++-----------------
2 files changed, 45 insertions(+), 30 deletions(-)
New commits:
commit 377d16bf8b61b5543233f4ffdef7dd1848585040
Author: Michael Meeks <michael.me...@suse.com>
Date: Tue Jun 26 20:20:41 2012 +0100
android: add --with-android-arch to make space for an x86 target
diff --git a/configure.in b/configure.in
index e282af3..d95d738 100644
--- a/configure.in
+++ b/configure.in
@@ -109,6 +109,23 @@ fi
dnl ===================================================================
dnl When building for Android the --with-android-ndk is mandatory
dnl ===================================================================
+
+AC_ARG_WITH(android-ndk,
+ AS_HELP_STRING([--with-android-ndk],
+ [Specify location of the Android Native Development Kit. Mandatory
when building for Android.]),
+,)
+
+AC_ARG_WITH(android-sdk,
+ AS_HELP_STRING([--with-android-sdk],
+ [Specify location of the Android SDK. Mandatory when building for
Android.]),
+,)
+
+AC_ARG_WITH(android-arch,
+ AS_HELP_STRING([--with-android-arch],
+ [Specify the Android target architecture - default is arm, or try
x86]),,
+ [with_android_arch=arm])
+
+ANDROID_ARCH=
ANDROID_NDK_HOME=
if test -n "$with_android_ndk"; then
ANDROID_NDK_HOME=$with_android_ndk
@@ -116,20 +133,27 @@ if test -n "$with_android_ndk"; then
# What if the NDK at some point starts including several toolchains for
different
# gcc versions (like some 3rd-party improved NDK builds already do)?
# Then the use of a wildcard below will break.
- ANDROID_ABI_PREBUILT_BIN=`echo
$ANDROID_NDK_HOME/toolchains/arm-linux*/prebuilt/*/bin`
-
- test -z "$SYSBASE" && export
SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-arm
- test -z "$AR" && AR=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-ar
- test -z "$NM" && NM=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-nm
- test -z "$OBJDUMP" &&
OBJDUMP=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-objdump
- test -z "$RANLIB" &&
RANLIB=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-ranlib
- test -z "$STRIP" &&
STRIP=$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-strip
-
- ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon
-Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
-
- test -z "$CC" && CC="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-gcc
$ANDROIDCFLAGS"
- test -z "$CXX" && CXX="$ANDROID_ABI_PREBUILT_BIN/arm-linux-androideabi-g++
$ANDROIDCFLAGS -I $ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include
-I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include"
+ ANDROID_ABI_PREBUILT_BIN=`echo
$ANDROID_NDK_HOME/toolchains/$with_android_arch-linux*/prebuilt/*/bin`
+
+ test -z "$SYSBASE" && export
SYSBASE=$ANDROID_NDK_HOME/platforms/android-9/arch-$with_android_arch
+ test -z "$AR" &&
AR=$ANDROID_ABI_PREBUILT_BIN/$with_android_arch-linux-androideabi-ar
+ test -z "$NM" &&
NM=$ANDROID_ABI_PREBUILT_BIN/$with_android_arch-linux-androideabi-nm
+ test -z "$OBJDUMP" &&
OBJDUMP=$ANDROID_ABI_PREBUILT_BIN/$with_android_arch-linux-androideabi-objdump
+ test -z "$RANLIB" &&
RANLIB=$ANDROID_ABI_PREBUILT_BIN/$with_android_arch-linux-androideabi-ranlib
+ test -z "$STRIP" &&
STRIP=$ANDROID_ABI_PREBUILT_BIN/$with_android_arch-linux-androideabi-strip
+
+ if test "$with_android_arch" = "arm"; then
+ ANDROIDCFLAGS="-march=armv7-a -mfloat-abi=softfp -mfpu=neon
-Wl,--fix-cortex-a8 --sysroot $ANDROID_NDK_HOME/platforms/android-9/arch-arm
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a"
+ ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I
$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include
-I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/armeabi-v7a/include"
+ else # x86
+ ANDROIDCFLAGS="-march=atom --sysroot
$ANDROID_NDK_HOME/platforms/android-9/arch-x86
-L$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/x86"
+ ANDROIDCXXFLAGS="$ANDROIDCFLAGS -I
$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/include
-I$ANDROID_NDK_HOME/sources/cxx-stl/gnu-libstdc++/libs/x86/include"
+ fi
+ test -z "$CC" &&
CC="$ANDROID_ABI_PREBUILT_BIN/$with_android_arch-linux-androideabi-gcc
$ANDROIDCFLAGS"
+ test -z "$CXX" &&
CXX="$ANDROID_ABI_PREBUILT_BIN/$with_android_arch-linux-androideabi-g++
$ANDROIDCXXFLAGS"
+ ANDROID_ARCH=$with_android_arch
fi
+AC_SUBST(ANDROID_ARCH)
AC_SUBST(ANDROID_NDK_HOME)
dnl ===================================================================
@@ -983,15 +1007,6 @@ AC_ARG_ENABLE(coretext,
dnl ===================================================================
dnl Optional Packages (--with/without-)
dnl ===================================================================
-AC_ARG_WITH(android-ndk,
- AS_HELP_STRING([--with-android-ndk],
- [Specify location of the Android Native Development Kit. Mandatory
when building for Android.]),
-,)
-
-AC_ARG_WITH(android-sdk,
- AS_HELP_STRING([--with-android-sdk],
- [Specify location of the Android SDK. Mandatory when building for
Android.]),
-,)
AC_ARG_WITH(gnu-patch,
AS_HELP_STRING([--with-gnu-patch],
commit 9b95765526d23e02cf00b475bd79d169be841b5c
Author: Michael Meeks <michael.me...@suse.com>
Date: Wed May 23 15:47:25 2012 +0100
android: make launcher function as expected - starts writer.
Remove now redundant FONTCONFIG cmdline arguments, and add fallbacks
for not having cmdline arguments in the intent when launching.
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 6564c7f..7b056e1 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -50,7 +50,7 @@ buildrcs:
echo "BRAND_BASE_DIR=file:///assets" >> assets/program/fundamentalrc
echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
module:$${BRAND_BASE_DIR}/share/registry/modules
res:$${BRAND_BASE_DIR}/share/registry
user:$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu'
>> assets/program/fundamentalrc
echo
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >>
assets/program/fundamentalrc
- echo 'URE_MORE_TYPES=' >> assets/program/fundamentalrc
+ echo 'URE_MORE_TYPES=file:///assets/ure/share/misc/types.rdb
file:///assets/program/types/types.rdb' >> assets/program/fundamentalrc
echo 'URE_MORE_SERVICES= <$$BRAND_BASE_DIR/program/services>*' >>
assets/program/fundamentalrc
echo 'BUNDLED_EXTENSIONS=$$BRAND_BASE_DIR/share/extensions' >>
assets/program/fundamentalrc
echo 'BUNDLED_EXTENSIONS_PREREG=$$BRAND_BASE_DIR/share/prereg/bundled'
>> assets/program/fundamentalrc
@@ -227,9 +227,8 @@ copy-stuff: buildrcs
mkdir -p assets/unpack/etc/fonts
cp fonts.conf assets/unpack/etc/fonts
# A sample file for fun ...
- mkdir -p assets/unpack/files
- if test -f /opt/libreoffice/tmp/writer.odt; then cp
/opt/libreoffice/tmp/writer.odt assets/unpack/files; fi
- if test -f /opt/libreoffice/tmp/writer.odt; then cp
/opt/libreoffice/tmp/writer.odt assets/unpack/etc; fi
+ mkdir -p assets/demo
+ if test -f /opt/libreoffice/tmp/writer.odt; then cp
/opt/libreoffice/tmp/writer.odt assets/demo; fi
#
# Then gdbserver and gdb.setup so that we can debug with ndk-gdb.
#
@@ -251,15 +250,11 @@ uninstall:
$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE)
run:
-<<<<<<< HEAD
- $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP)
-# add -e lo-strace "-f -o /somewhere/the/app/can/write.log" if you want
-=======
- echo "FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf
-env:INIFILENAME=file:///assets/program/sofficerc" > cmdline
+ echo "-env:INIFILENAME=file:///assets/program/sofficerc" > cmdline
+# echo "file:///assets/demo/writer.odt" > cmdline
$(ANDROID_SDK_HOME)/platform-tools/adb push cmdline
$(APP_DATA_PATH)/cmdline
- $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libmergedlo -e lo-strace yes -e
lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
+ $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP) -e lo-strace yes -e lo-main-indirect-cmdline
"$(APP_DATA_PATH)/cmdline"
# add -e lo-strace yes # if you want that
->>>>>>> android: remove duplicate services.rdb from config, and static bits
# If you reinstall an app several times, even if you uninstall it
# between, disk space seems to leak that won't get recycled until you
commit d091217028c0bcc83fb18873a8d47ef813e5b959
Author: Michael Meeks <michael.me...@suse.com>
Date: Tue May 22 10:13:56 2012 +0100
android: remove duplicate services.rdb from config, and static bits
diff --git a/android/qa/desktop/Makefile b/android/qa/desktop/Makefile
index 2f7cbd0..6564c7f 100644
--- a/android/qa/desktop/Makefile
+++ b/android/qa/desktop/Makefile
@@ -50,8 +50,8 @@ buildrcs:
echo "BRAND_BASE_DIR=file:///assets" >> assets/program/fundamentalrc
echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry
module:$${BRAND_BASE_DIR}/share/registry/modules
res:$${BRAND_BASE_DIR}/share/registry
user:$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu'
>> assets/program/fundamentalrc
echo
'URE_BIN_DIR=file:///assets/ure/bin/dir/not-here/can-we/exec-anyway' >>
assets/program/fundamentalrc
- echo 'URE_MORE_TYPES=file:///assets/ure/share/misc/types.rdb
file:///assets/program/types/types.rdb' >> assets/program/fundamentalrc
- echo 'URE_MORE_SERVICES=<$$BRAND_BASE_DIR/program/services>*' >>
assets/program/fundamentalrc
+ echo 'URE_MORE_TYPES=' >> assets/program/fundamentalrc
+ echo 'URE_MORE_SERVICES= <$$BRAND_BASE_DIR/program/services>*' >>
assets/program/fundamentalrc
echo 'BUNDLED_EXTENSIONS=$$BRAND_BASE_DIR/share/extensions' >>
assets/program/fundamentalrc
echo 'BUNDLED_EXTENSIONS_PREREG=$$BRAND_BASE_DIR/share/prereg/bundled'
>> assets/program/fundamentalrc
echo
'BUNDLED_EXTENSIONS_USER=$${$$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/extensions/bundled'
>> assets/program/fundamentalrc
@@ -122,8 +122,6 @@ copy-stuff: buildrcs
fileacc \
forlo \
foruilo \
- fpicker.uno \
- fps_office.uno \
fsstorage.uno \
gcc3_uno \
hyphenlo \
@@ -253,8 +251,15 @@ uninstall:
$(ANDROID_SDK_HOME)/platform-tools/adb uninstall $(APP_PACKAGE)
run:
+<<<<<<< HEAD
$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP)
# add -e lo-strace "-f -o /somewhere/the/app/can/write.log" if you want
+=======
+ echo "FONTCONFIG_FILE=$(APP_DATA_PATH)/etc/fonts/fonts.conf
-env:INIFILENAME=file:///assets/program/sofficerc" > cmdline
+ $(ANDROID_SDK_HOME)/platform-tools/adb push cmdline
$(APP_DATA_PATH)/cmdline
+ $(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n
$(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-library libmergedlo -e lo-strace yes -e
lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
+# add -e lo-strace yes # if you want that
+>>>>>>> android: remove duplicate services.rdb from config, and static bits
# If you reinstall an app several times, even if you uninstall it
# between, disk space seems to leak that won't get recycled until you
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
