diff options
| author | Michael Meeks <michael.meeks@suse.com> | 2012-12-13 19:33:42 +0000 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-02-21 22:54:36 +0200 |
| commit | 52a8744afee2cd589813f0377d93f821fce7aedd (patch) | |
| tree | 1c68647d4a31559e77e8b8be98e15bb9af18f76a /sal/Module_sal.mk | |
| parent | f68cd77923ed996c372e6814d615c6faf635626a (diff) | |
Revert "Clean up remains of NativeActivity-based Android app support"
This reverts commit cecc926070ee3d2ad6296fc5e0cfcde8642bb140.
Conflicts:
sal/android/lo-bootstrap.c
sal/inc/osl/detail/android-bootstrap.h
Diffstat (limited to 'sal/Module_sal.mk')
| -rw-r--r-- | sal/Module_sal.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/sal/Module_sal.mk b/sal/Module_sal.mk index 7d20fa388992..af97e4805703 100644 --- a/sal/Module_sal.mk +++ b/sal/Module_sal.mk @@ -31,8 +31,7 @@ $(eval $(call gb_Module_Module,sal)) $(eval $(call gb_Module_add_targets,sal,\ CustomTarget_generated \ CustomTarget_sal_allheaders \ - $(if $(filter DESKTOP,$(BUILD_TYPE)), \ - Executable_cppunittester) \ + Executable_cppunittester \ $(if $(filter $(OS),ANDROID), \ Library_lo-bootstrap) \ Library_sal \ @@ -46,14 +45,13 @@ $(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) \ @@ -90,8 +88,6 @@ $(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 \ |