[Libreoffice-commits] core.git: 4 commits - android/CustomTarget_android_desktop.mk android/CustomTarget_docloader.mk android/CustomTarget_lo4android.mk android/CustomTarget_sdremote.mk android/experimental android/sdremote solenv/gbuild
Peter Foley
pefoley2 at verizon.net
Fri Mar 1 15:52:08 PST 2013
android/CustomTarget_android_desktop.mk | 4 ++--
android/CustomTarget_docloader.mk | 6 +++---
android/CustomTarget_lo4android.mk | 4 ++--
android/CustomTarget_sdremote.mk | 6 +++---
android/experimental/.gitignore | 2 ++
android/experimental/DocumentLoader/Makefile | 2 +-
android/experimental/LibreOffice4Android/Makefile | 2 +-
android/experimental/desktop/Makefile | 2 +-
android/sdremote/Makefile | 2 +-
solenv/gbuild/platform/unxgcc.mk | 2 +-
10 files changed, 17 insertions(+), 15 deletions(-)
New commits:
commit b3d6c635966ed20e2c9e4e6be6ced03d2358563c
Author: Peter Foley <pefoley2 at verizon.net>
Date: Fri Mar 1 18:49:40 2013 -0500
fix build with lto
Change-Id: If6544eae78a7f3d012368d62cc99d29160b1b47a
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 206a598..1b85ced 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -106,7 +106,7 @@ endif
ifeq ($(ENABLE_LTO),TRUE)
ifneq ($(COM_GCC_IS_CLANG),TRUE)
-gb_LinkTarget_LDFLAGS += -fuse-linker-plugin $(gb_COMPILERDEFAULTOPTFLAGS)
+gb_LinkTarget_LTOFLAGS += -fuse-linker-plugin $(gb_COMPILERDEFAULTOPTFLAGS)
endif
endif
commit daec4883baf9be9d814ddc92efe703bc9e282f39
Author: Peter Foley <pefoley2 at verizon.net>
Date: Fri Mar 1 18:48:33 2013 -0500
android/sdremote dosen't need to depend on everything
Change-Id: Iae5b37873f991ab33b8fd7ada7e5f936e83690db
diff --git a/android/CustomTarget_docloader.mk b/android/CustomTarget_docloader.mk
index 523a493..63fcfb7 100644
--- a/android/CustomTarget_docloader.mk
+++ b/android/CustomTarget_docloader.mk
@@ -20,7 +20,7 @@ $(call gb_CustomTarget_get_target,android/docloader) : \
# out Bootstrap while another is building stuff that depends on it.
# Yeah, this sucks
-$(docloader_DIR)/done : $(sdremote_DIR)/done
+$(docloader_DIR)/done : $(sdremote_DIR)/done $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
cd $(SRCDIR)/android/experimental/DocumentLoader && $(MAKE) all
mkdir -p $(WORKDIR)/installation/bin
diff --git a/android/CustomTarget_sdremote.mk b/android/CustomTarget_sdremote.mk
index 79f980a..c5705bd 100644
--- a/android/CustomTarget_sdremote.mk
+++ b/android/CustomTarget_sdremote.mk
@@ -12,7 +12,7 @@ sdremote_DIR := $(call gb_CustomTarget_get_workdir,android/sdremote)
$(call gb_CustomTarget_get_target,android/sdremote) : $(sdremote_DIR)/done
-$(sdremote_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
+$(sdremote_DIR)/done:
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
cd $(SRCDIR)/android/sdremote && $(MAKE) all
mkdir -p $(WORKDIR)/installation/bin
commit 251f6a416c6a51d02977530624012232908befd2
Author: Peter Foley <pefoley2 at verizon.net>
Date: Fri Mar 1 18:27:53 2013 -0500
add more stuff to android gitignore
Change-Id: Ibc61098fbde8d253411d834822e3f0c67249c52a
diff --git a/android/experimental/.gitignore b/android/experimental/.gitignore
new file mode 100644
index 0000000..e63eb4a
--- /dev/null
+++ b/android/experimental/.gitignore
@@ -0,0 +1,2 @@
+*/jni/Application.mk
+*/liblo-native-code.map
commit b89ea45e5ba32589f69b9539851a51fbe2199a85
Author: Peter Foley <pefoley2 at verizon.net>
Date: Fri Mar 1 18:27:04 2013 -0500
fix android build in separate dir
Change-Id: Id7cf80e1da87a56dee645dc01e64dedc4a8586ab
diff --git a/android/CustomTarget_android_desktop.mk b/android/CustomTarget_android_desktop.mk
index bc62a33..185f9ac 100644
--- a/android/CustomTarget_android_desktop.mk
+++ b/android/CustomTarget_android_desktop.mk
@@ -24,8 +24,8 @@ $(call gb_CustomTarget_get_target,android/desktop) : \
$(android_desktop_DIR)/done : $(lo4android_DIR)/done
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
cd $(SRCDIR)/android/experimental/desktop && $(MAKE) all
- mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
- cp $(SRCDIR)/android/experimental/desktop/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
+ mkdir -p $(WORKDIR)/installation/bin
+ cp $(SRCDIR)/android/experimental/desktop/bin/*-debug.apk $(WORKDIR)/installation/bin
$(call gb_CustomTarget_get_clean_target,android/desktop) :
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
diff --git a/android/CustomTarget_docloader.mk b/android/CustomTarget_docloader.mk
index c30699e..523a493 100644
--- a/android/CustomTarget_docloader.mk
+++ b/android/CustomTarget_docloader.mk
@@ -23,8 +23,8 @@ $(call gb_CustomTarget_get_target,android/docloader) : \
$(docloader_DIR)/done : $(sdremote_DIR)/done
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
cd $(SRCDIR)/android/experimental/DocumentLoader && $(MAKE) all
- mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
- cp $(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
+ mkdir -p $(WORKDIR)/installation/bin
+ cp $(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk $(WORKDIR)/installation/bin
$(call gb_CustomTarget_get_clean_target,android/docloader) :
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
diff --git a/android/CustomTarget_lo4android.mk b/android/CustomTarget_lo4android.mk
index 461067a..30d0e11 100644
--- a/android/CustomTarget_lo4android.mk
+++ b/android/CustomTarget_lo4android.mk
@@ -24,8 +24,8 @@ $(call gb_CustomTarget_get_target,android/lo4android) : \
$(lo4android_DIR)/done : $(docloader_DIR)/done
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
cd $(SRCDIR)/android/experimental/LibreOffice4Android && $(MAKE) all
- mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
- cp $(SRCDIR)/android/experimental/LibreOffice4Android/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
+ mkdir -p $(WORKDIR)/installation/bin
+ cp $(SRCDIR)/android/experimental/LibreOffice4Android/bin/*-debug.apk $(WORKDIR)/installation/bin
$(call gb_CustomTarget_get_clean_target,android/lo4android) :
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
diff --git a/android/CustomTarget_sdremote.mk b/android/CustomTarget_sdremote.mk
index 69a572a..79f980a 100644
--- a/android/CustomTarget_sdremote.mk
+++ b/android/CustomTarget_sdremote.mk
@@ -15,8 +15,8 @@ $(call gb_CustomTarget_get_target,android/sdremote) : $(sdremote_DIR)/done
$(sdremote_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNative)
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
cd $(SRCDIR)/android/sdremote && $(MAKE) all
- mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin
- cp $(SRCDIR)/android/sdremote/bin/ImpressRemote-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin
+ mkdir -p $(WORKDIR)/installation/bin
+ cp $(SRCDIR)/android/sdremote/bin/ImpressRemote-debug.apk $(WORKDIR)/installation/bin
$(call gb_CustomTarget_get_clean_target,android/sdremote) :
$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
diff --git a/android/experimental/DocumentLoader/Makefile b/android/experimental/DocumentLoader/Makefile
index 136f201..4f738c2 100644
--- a/android/experimental/DocumentLoader/Makefile
+++ b/android/experimental/DocumentLoader/Makefile
@@ -1,4 +1,4 @@
-include ../../../config_host.mk
+include $(BUILDDIR)/config_host.mk
# The default target just builds.
all: build-ant
diff --git a/android/experimental/LibreOffice4Android/Makefile b/android/experimental/LibreOffice4Android/Makefile
index d33bcae..f932235 100644
--- a/android/experimental/LibreOffice4Android/Makefile
+++ b/android/experimental/LibreOffice4Android/Makefile
@@ -1,4 +1,4 @@
-include ../../../config_host.mk
+include $(BUILDDIR)/config_host.mk
# The default target just builds.
diff --git a/android/experimental/desktop/Makefile b/android/experimental/desktop/Makefile
index d4b7945..eb4b029 100644
--- a/android/experimental/desktop/Makefile
+++ b/android/experimental/desktop/Makefile
@@ -1,4 +1,4 @@
-include ../../../config_host.mk
+include $(BUILDDIR)/config_host.mk
# The default target just builds.
all: build-ant
diff --git a/android/sdremote/Makefile b/android/sdremote/Makefile
index 49fad92..eb78e0d 100644
--- a/android/sdremote/Makefile
+++ b/android/sdremote/Makefile
@@ -6,7 +6,7 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-include ../../config_host.mk
+include $(BUILDDIR)/config_host.mk
all: properties translations.done
mkdir -p ../abs-lib/libs
More information about the Libreoffice-commits
mailing list