diff options
| author | Bryan Quigley <gquigs@gmail.com> | 2014-08-04 17:31:23 -0400 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-09-09 15:20:35 +0200 |
| commit | 496bc3cd6c037360632c33471c4622a095cdcadd (patch) | |
| tree | 694253c3f03821765ec9fa3636e4255b3c4ea210 /Repository.mk | |
| parent | 1d62f6a24f6160c33ad5c96f39b2ab3c918f0625 (diff) | |
fdo#45071 Remove Libreoffice browser plugin
This removes ENABLE_NPAPI_INTO_BROWSER while it should keep
ENABLE_NPAPI_FROM_BROWSER (embed flash in LO) intact.
Signed-off-by: Stephan Bergmann <sbergman@redhat.com>
Conflicts:
extensions/source/nsplugin/source/npshell.cxx
Change-Id: I80a9159a75653c74423d8fdc7c188568d3188e04
Diffstat (limited to 'Repository.mk')
| -rw-r--r-- | Repository.mk | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Repository.mk b/Repository.mk index 7ed4be538746..707a0c130285 100644 --- a/Repository.mk +++ b/Repository.mk @@ -88,7 +88,6 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,ooo, \ $(eval $(call gb_Helper_register_executables,OOO, \ $(call gb_Helper_optional,CRASHREP,crashrep) \ gnome-open-url.bin \ - $(if $(ENABLE_NPAPI_INTO_BROWSER),nsplugin) \ $(if $(filter-out ANDROID IOS MACOSX WNT,$(OS)),oosplash) \ $(if $(ENABLE_NPAPI_FROM_BROWSER),pluginapp.bin) \ soffice_bin \ @@ -145,12 +144,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \ endif -ifeq ($(ENABLE_NPAPI_INTO_BROWSER),TRUE) -$(eval $(call gb_Helper_register_libraries,PLAINLIBS_OOO, \ - npsoplugin \ -)) -endif - ifeq ($(OS),MACOSX) $(eval $(call gb_Helper_register_libraries,PLAINLIBS_NONE, \ |