From b7525f1f1d123084b60269f420300afdd405b0d1 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Thu, 4 Apr 2013 22:46:53 +0200 Subject: Drop jvmaccess and jvmfwk when no SOLAR_JAVA Just sprinkle #ifdef SOLAR_JAVA into the code instead. In the source for jvmaccess and jvmfwk such ifdefs can be removed as it isn't compiled unless SOLAR_JAVA. Change-Id: Ia8614f8bd6d833582d3b79b5fb75f9153fa79606 --- jvmfwk/Module_jvmfwk.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'jvmfwk/Module_jvmfwk.mk') diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk index 719bf79dc3a5..dae1b6fdea72 100644 --- a/jvmfwk/Module_jvmfwk.mk +++ b/jvmfwk/Module_jvmfwk.mk @@ -27,14 +27,14 @@ $(eval $(call gb_Module_Module,jvmfwk)) +ifeq ($(SOLAR_JAVA),TRUE) + $(eval $(call gb_Module_add_targets,jvmfwk,\ Library_jvmfwk \ Package_inc \ Package_rcfiles \ )) -ifneq ($(SOLAR_JAVA),) - $(eval $(call gb_Module_add_targets,jvmfwk,\ CustomTarget_jreproperties \ Library_sunjavaplugin \ -- cgit