diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-13 00:40:19 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-13 00:43:44 +0200 |
| commit | 46cb9a29823073e042ea9e1c065328faafc53b80 (patch) | |
| tree | 999efe807cd76e1fe1f4739975b505762692be49 /android/CustomTarget_android_desktop.mk | |
| parent | ef23b47e887908161d980f3e6f6d321f18acca77 (diff) | |
Copy the .apks where the daily build uploader will find them
Sure, it is not "clean" to write to $(SRCDIR)/instsetoo_native/$(INPATH)/bin,
but as long as the push_nightlies.sh script looks in instsetoo_native for
.apks, that is where they need to go.
This partially reverts commit b89ea45e5ba32589f69b9539851a51fbe2199a85.
Change-Id: If1a0e50516f20c7571566a2cfa7e6a4b1dad30e4
Diffstat (limited to 'android/CustomTarget_android_desktop.mk')
| -rw-r--r-- | android/CustomTarget_android_desktop.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/android/CustomTarget_android_desktop.mk b/android/CustomTarget_android_desktop.mk index 185f9ac16f06..a1e12d74c4c3 100644 --- a/android/CustomTarget_android_desktop.mk +++ b/android/CustomTarget_android_desktop.mk @@ -24,8 +24,12 @@ $(call gb_CustomTarget_get_target,android/desktop) : \ $(android_desktop_DIR)/done : $(lo4android_DIR)/done $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) cd $(SRCDIR)/android/experimental/desktop && $(MAKE) all - mkdir -p $(WORKDIR)/installation/bin - cp $(SRCDIR)/android/experimental/desktop/bin/*-debug.apk $(WORKDIR)/installation/bin +# If SRCDIR==BUILDDIR, copy to $(SRCDIR)/instsetoo_native/$(INPATH)/bin as that is where the tinderbox build script +# still looks for the .apk, and we want fresh daily builds to be uploaded. + if test $(SRCDIR) = $(BUILDDIR); then \ + mkdir -p $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \ + cp $(SRCDIR)/android/experimental/desktop/bin/*-debug.apk $(SRCDIR)/instsetoo_native/$(INPATH)/bin; \ + fi $(call gb_CustomTarget_get_clean_target,android/desktop) : $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) |