diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-10-11 01:53:29 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2015-10-11 02:03:13 +0200 |
| commit | ee8257a1c70eadb7330b0ee99ec3b86fe4084bdf (patch) | |
| tree | c30c86bfa14fc46d94b2da4a3087be9e972c5772 /android/CustomTarget_lo_android.mk | |
| parent | 8dc648d0f32e94fe283e2d635f236012491819ca (diff) | |
migrate android build to gradle
move preparation tasks (creating assets/processing files) from the
makefile into the gradle script
This allows much easier integration into android-studio (just open
android/source with android studio after running make to compile the
native library)
Change-Id: I9a9d6832797c24a7e195a1c7954cd6d20f5a8496
Diffstat (limited to 'android/CustomTarget_lo_android.mk')
| -rw-r--r-- | android/CustomTarget_lo_android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android/CustomTarget_lo_android.mk b/android/CustomTarget_lo_android.mk index 37f3012e6275..05d6d4353d9f 100644 --- a/android/CustomTarget_lo_android.mk +++ b/android/CustomTarget_lo_android.mk @@ -20,7 +20,7 @@ $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNa # 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/source/bin/*-debug.apk $(BUILDDIR)/instsetoo_native/foo/bin + cp $(SRCDIR)/android/source/build/outputs/apk/*-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) |