diff options
| author | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-21 23:02:32 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-11-21 23:03:57 +0200 |
| commit | cecc926070ee3d2ad6296fc5e0cfcde8642bb140 (patch) | |
| tree | 50ac14acc645af18f7ee9cb6907f127a99de5185 /sal/Module_sal.mk | |
| parent | 679628f248a94d54e78c8531d13e65f3ae221876 (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/Module_sal.mk')
| -rw-r--r-- | sal/Module_sal.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index c5215b8ce971..475a69599256 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -31,7 +31,8 @@ $(eval $(call gb_Module_Module,sal)) $(eval $(call gb_Module_add_targets,sal,\ CustomTarget_generated \ CustomTarget_sal_allheaders \ - Executable_cppunittester \ + $(if $(filter DESKTOP,$(BUILD_TYPE)), \ + Executable_cppunittester) \ $(if $(filter $(OS),ANDROID), \ Library_lo-bootstrap) \ Library_sal \ @@ -45,13 +46,14 @@ $(eval $(call gb_Module_add_targets,sal,\ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) + $(eval $(call gb_Module_add_targets,sal,\ Executable_osl_process_child \ )) + $(eval $(call gb_Module_add_check_targets,sal,\ CppunitTest_sal_osl_process \ )) -endif $(eval $(call gb_Module_add_check_targets,sal,\ $(if $(filter TRUE,$(DISABLE_DYNLOADING)),,CppunitTest_Module_DLL) \ @@ -87,6 +89,8 @@ $(eval $(call gb_Module_add_check_targets,sal,\ CppunitTest_sal_rtl_math \ )) +endif + # CppunitTest_sal_osl_pipe has circular dependency on unotest # $(eval $(call gb_Module_add_subsequentcheck_targets,sal,\ CppunitTest_sal_osl_pipe \ |