diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-08-22 14:49:13 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2012-08-22 14:50:39 +0300 |
| commit | b34b7c93bd35e63fedf280e93a714511fdf436b2 (patch) | |
| tree | 38882922f979cdcfe72ee4e833b2e41b89fb313a /android | |
| parent | 0e3510d14e46b0986a58a1aaffadbf6e42261abd (diff) | |
flock is not portable, so use different approach
Change-Id: I4a864ddd3681101c8c5d0943d2761ac85bf4161f
Diffstat (limited to 'android')
| -rw-r--r-- | android/CustomTarget_docloader.mk | 14 | ||||
| -rw-r--r-- | android/CustomTarget_sdremote.mk | 8 |
2 files changed, 10 insertions, 12 deletions
diff --git a/android/CustomTarget_docloader.mk b/android/CustomTarget_docloader.mk index d4007e7ad9ed..326da49e4270 100644 --- a/android/CustomTarget_docloader.mk +++ b/android/CustomTarget_docloader.mk @@ -20,13 +20,15 @@ $(call gb_CustomTarget_get_target,android/docloader) : \ $(call gb_Module_get_target,sw) \ $(call gb_Module_get_target,sc) -$(docloader_DIR)/done : $(gb_Helper_PHONY) +# We know that CustomTarget_sdremote.mk is included first, so sdremote_DIR is +# defined. We want that to be built completely first, so that we can +# serialize Ant access to abs-lib, which is used both by DocumentLoader and +# sdremote. We don't want one Ant to be cleaning out abs-lib while another is +# building stuff that depends on it. Yeah, this sucks + +$(docloader_DIR)/done : $(sdremote_DIR)/done $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1) -# Lock needed to serialize the Ant cleaning/building which cleans/builds also -# abs-lib both for DocumentLoader and sdremote. We don't want one Ant to be -# cleaning out abs-lib while another is building stuff that depends on -# it. yeah, this sucks - cd $(SRCDIR)/android/experimental/DocumentLoader && flock $(SRCDIR)/android/lock sh -c "$(MAKE) clean && $(MAKE) all" + cd $(SRCDIR)/android/experimental/DocumentLoader && $(MAKE) clean && $(MAKE) all mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin cp $(SRCDIR)/android/experimental/DocumentLoader/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin diff --git a/android/CustomTarget_sdremote.mk b/android/CustomTarget_sdremote.mk index e3f08d7cef96..ae053508bc3e 100644 --- a/android/CustomTarget_sdremote.mk +++ b/android/CustomTarget_sdremote.mk @@ -12,13 +12,9 @@ sdremote_DIR := $(call gb_CustomTarget_get_workdir,android/sdremote) $(call gb_CustomTarget_get_target,android/sdremote) : $(sdremote_DIR)/done -$(sdremote_DIR)/done : $(gb_Helper_PHONY) +$(sdremote_DIR)/done : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,1) -# Lock needed to serialize the Ant cleaning/building which cleans/builds also -# abs-lib both for DocumentLoader and sdremote. We don't want one Ant to be -# cleaning out abs-lib while another is building stuff that depends on -# it. yeah, this sucks - cd $(SRCDIR)/android/sdremote && flock $(SRCDIR)/android/lock sh -c "$(MAKE) clean && $(MAKE) all" + cd $(SRCDIR)/android/sdremote && $(MAKE) clean && $(MAKE) all mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin cp $(SRCDIR)/android/sdremote/bin/ImpressRemote-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin |