summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-05-28 14:45:19 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-05-28 14:51:19 +0100
commit35382d56f839a9e569dab995933be8fe1a60da27 (patch)
tree94039b4e2b4b05b8308691f9cf5c43cae260da7b
parent7748fc7747eb231684770f2ef06d40811c325062 (diff)
android: build and package the fpicker so we can select files to open
-rw-r--r--fpicker/Module_fpicker.mk4
-rw-r--r--postprocess/packcomponents/makefile.mk4
2 files changed, 2 insertions, 6 deletions
diff --git a/fpicker/Module_fpicker.mk b/fpicker/Module_fpicker.mk
index 1edc7c9d17ef..a2c008583801 100644
--- a/fpicker/Module_fpicker.mk
+++ b/fpicker/Module_fpicker.mk
@@ -27,8 +27,6 @@
$(eval $(call gb_Module_Module,fpicker))
-ifneq ($(filter DESKTOP,$(BUILD_TYPE)),)
-
$(eval $(call gb_Module_add_targets,fpicker,\
AllLangResTarget_fps_office \
Library_fpicker \
@@ -50,6 +48,4 @@ $(eval $(call gb_Module_add_targets,fpicker,\
))
endif
-endif
-
# vim: set noet sw=4 ts=4:
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index 3ee661251520..7cc0bb21831c 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -63,6 +63,8 @@ my_components = \
component/filter/source/xsltdialog/xsltdlg \
component/filter/source/xsltfilter/xsltfilter \
component/formula/util/for \
+ component/fpicker/source/generic/fpicker \
+ component/fpicker/source/office/fps_office \
component/framework/util/fwk \
component/framework/util/fwl \
component/framework/util/fwm \
@@ -169,8 +171,6 @@ my_components += \
component/extensions/source/resource/res \
component/extensions/source/scanner/scn \
component/extensions/source/update/feed/updatefeed \
- component/fpicker/source/generic/fpicker \
- component/fpicker/source/office/fps_office \
syssh \
component/xmlhelp/source/treeview/tvhlp1 \
component/xmlhelp/util/ucpchelp1 \