diff -ur nss.org/nspr/build/autoconf/config.sub nss/nspr/build/autoconf/config.sub --- nss.org/nspr/build/autoconf/config.sub 2017-09-07 15:29:45.031246453 +0200 +++ nss/nspr/build/autoconf/config.sub 2017-09-07 15:32:13.087235423 +0200 @@ -110,6 +110,11 @@ exit 1;; esac +if test $1 = "arm-unknown-linux-androideabi"; then echo $1; exit; fi +if test $1 = "aarch64-unknown-linux-android"; then echo $1; exit; fi +if test $1 = "i686-pc-linux-android"; then echo $1; exit; fi +if test $1 = "x86_64-pc-linux-android"; then echo $1; exit; fi + # Split fields of configuration type # shellcheck disable=SC2162 IFS="-" read field1 field2 field3 field4 <>confdefs.h diff -ur nss.org/nss/Makefile nss/nss/Makefile --- nss.org/nss/Makefile 2017-09-07 15:29:44.933245745 +0200 +++ nss/nss/Makefile 2017-09-07 15:32:04.347181076 +0200 @@ -65,7 +65,7 @@ ifeq ($(OS_TARGET),Android) NSPR_CONFIGURE_OPTS += --with-android-ndk=$(ANDROID_NDK) \ - --target=$(ANDROID_PREFIX) \ + --with-arch=toolchain-default \ --with-android-version=$(OS_TARGET_RELEASE) \ --with-android-toolchain=$(ANDROID_TOOLCHAIN) \ --with-android-platform=$(ANDROID_SYSROOT) --- nss/nss/Makefile.orig 2019-11-26 14:52:15.934561202 +0100 +++ nss/nss/Makefile 2019-11-26 14:52:20.538559612 +0100 @@ -140,7 +140,6 @@ build_nspr: $(NSPR_CONFIG_STATUS) $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) - $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME)/pr/tests install_nspr: build_nspr $(MAKE) -C $(CORE_DEPTH)/../nspr/$(OBJDIR_NAME) install --- nss/nss/lib/ckfw/builtins/manifest.mn.orig 2019-11-26 15:18:22.185985193 +0100 +++ nss/nss/lib/ckfw/builtins/manifest.mn 2019-11-26 15:18:29.281982387 +0100 @@ -5,7 +5,7 @@ CORE_DEPTH = ../../.. -DIRS = testlib +DIRS = MODULE = nss diff -ur nss/nss/coreconf/arch.mk nss/nss/coreconf/arch.mk --- nss/nss/coreconf/arch.mk 2019-11-01 10:29:44.933245745 +0100 +++ nss/nss/coreconf/arch.mk 2019-11-01 10:32:04.347181076 +0100 @@ -213,7 +213,15 @@ # # this should be configurable from the user # - OS_TEST := arm + ifneq (,$(filter x86 x86_64,$(ANDROID_APP_ABI))) + OS_TEST := $(ANDROID_APP_ABI) + else + ifeq ($(USE_64),1) + OS_TEST := aarch64 + else + OS_TEST := arm + endif + endif OS_ARCH = Android ifndef OS_TARGET_RELEASE OS_TARGET_RELEASE := 8 ra/cp-4.3'>distro/collabora/cp-4.3 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
path: root/pyuno/Rdb_pyuno.mk
diff options
context:
space:
mode:
authorGökay Şatır <gokaysatir@gmail.com>2023-09-01 09:49:53 +0300
committerMiklos Vajna <vmiklos@collabora.com>2023-09-12 17:09:18 +0200
commit62cc2217217650d23c72e4646ccd793f76722d94 (patch)
treed7e0d86f0a0135b1ee75bd1e3634dec53f902119 /pyuno/Rdb_pyuno.mk
parentb8f6f91f476f1c3f93bb44265381305f6f02b161 (diff)
Added parent / child relationship to comments.
Adding parent name of a comment into odf file when there is a parent. Also includes: Added test case to comment property test. Change-Id: I033f6574b4875fcb76b16c8b5b9d9f7d55b52cbe Also includes: Add parent / child relations to replied comments. Change-Id: Ia7d95c4e6020b501798a89cbdcae64dc5691437c Change-Id: I08b5ab6eb11adcafcbf3559896d79d41b449b26a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156824 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>