summaryrefslogtreecommitdiff
path: root/sal/Library_sal.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@suse.com>2012-11-21 23:02:32 +0200
committerTor Lillqvist <tlillqvist@suse.com>2012-11-21 23:03:57 +0200
commitcecc926070ee3d2ad6296fc5e0cfcde8642bb140 (patch)
tree50ac14acc645af18f7ee9cb6907f127a99de5185 /sal/Library_sal.mk
parent679628f248a94d54e78c8531d13e65f3ae221876 (diff)
Clean up remains of NativeActivity-based Android app support
We haven't been able to build NativeActivity-based apps (like the android/qa/sc and anroid/qa/desktop thingies) since we switched to DISABLE_DYNLOADING and a single DSO liblo-native-code.so anyway. No lo_main() any more. <sal/main.h> should not be included ever when compiling for Android of iOS now. Lots of stuff binned from vcl's androidinst.cxx, in the (vain?) hope that it will reduce the amount of never invoked GUI code that gets linked in. Change-Id: I25f584864c40110774c728a23151e089620442d9
Diffstat (limited to 'sal/Library_sal.mk')
-rw-r--r--sal/Library_sal.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index d537bc0947a5..8990fc969596 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -177,7 +177,7 @@ $(eval $(call gb_Library_add_exception_objects,sal,\
sal/osl/unx/module \
sal/osl/unx/process \
sal/osl/unx/process_impl \
- sal/osl/unx/salinit \
+ $(if $(filter DESKTOP,$(BUILD_TYPE)), sal/osl/unx/salinit) \
sal/osl/unx/uunxapi \
))
$(eval $(call gb_Library_add_cobjects,sal,\