diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-05-21 17:01:09 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-05-21 17:10:19 +0100 |
| commit | ab8cbb6cc121f7001a920f9d9f12cd9ccddec385 (patch) | |
| tree | 9bb1bb4e6b2f3d055f3dbc9de9871ca0d3d20618 /android/CustomTarget_lo_android.mk | |
| parent | 1b53066433d1db9c3bfc3c6e6618565c15642b59 (diff) | |
Let's simplify the paths and be less 'experimental'
Diffstat (limited to 'android/CustomTarget_lo_android.mk')
| -rw-r--r-- | android/CustomTarget_lo_android.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk index 24225c0257a1..37f3012e6275 100644 --- a/android/CustomTarget_lo_android.mk +++ b/android/CustomTarget_lo_android.mk @@ -8,22 +8,22 @@ $(eval $(call gb_CustomTarget_CustomTarget,android/loandroid3)) -loandroid3_DIR := $(call gb_CustomTarget_get_workdir,android/experimental/LOAndroid3) +loandroid3_DIR := $(call gb_CustomTarget_get_workdir,android/source) $(call gb_CustomTarget_get_target,android/loandroid3) : \ $(loandroid3_DIR)/done $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNative) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2) - cd $(SRCDIR)/android/experimental/LOAndroid3 && $(MAKE) all + cd $(SRCDIR)/android/source && $(MAKE) all # Copy to $(BUILDDIR)/instsetoo_native as that is where the tinderbox build script # still looks for the .apk, and we want fresh daily builds to be uploaded. # Us "foo" instead of the old INPATH mkdir -p $(BUILDDIR)/instsetoo_native/foo/bin; \ - cp $(SRCDIR)/android/experimental/LOAndroid3/bin/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin + cp $(SRCDIR)/android/source/bin/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin $(call gb_CustomTarget_get_clean_target,android/loandroid3) : $(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2) - cd $(SRCDIR)/android/experimental/LOAndroid3 && $(MAKE) clean + cd $(SRCDIR)/android/source && $(MAKE) clean # vim: set noet sw=4 ts=4: |