[Libreoffice-commits] core.git: codemaker/Module_codemaker.mk

jan Iversen jani at libreoffice.org
Tue Jun 27 11:03:47 UTC 2017


 codemaker/Module_codemaker.mk |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b59722cd2aa2d13562d288fc07cca50c2ce2d638
Author: jan Iversen <jani at libreoffice.org>
Date:   Tue Jun 27 13:00:04 2017 +0200

    android, fix codemaker buildbreaker
    
    Interesting android does not use --enable-java
    
    Change-Id: If834485d5a1cfcd2c6ddcd6f30dcbb61aa838dae

diff --git a/codemaker/Module_codemaker.mk b/codemaker/Module_codemaker.mk
index 8b8f13f3b4fa..6571ab2ca586 100644
--- a/codemaker/Module_codemaker.mk
+++ b/codemaker/Module_codemaker.mk
@@ -14,8 +14,8 @@ ifneq (,$(if $(CROSS_COMPILING),,T)$(filter ODK,$(BUILD_TYPE)))
 $(eval $(call gb_Module_add_targets,codemaker,\
     StaticLibrary_codemaker \
     StaticLibrary_codemaker_cpp \
-    $(if $(filter TRUE,$(ENABLE_JAVA)),StaticLibrary_codemaker_java) \
-    $(if $(filter TRUE,$(ENABLE_JAVA)),Executable_javamaker) \
+    StaticLibrary_codemaker_java \
+    Executable_javamaker \
     Executable_cppumaker \
 ))
 endif


More information about the Libreoffice-commits mailing list