diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2020-07-17 09:33:31 +0200 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-07-17 14:35:53 +0200 |
| commit | f2180bdc20c76ca70eb39dcddfb7e0da98315aba (patch) | |
| tree | 86000206e3582d8744844db601c04d5e46c66d4e | |
| parent | tdf#134846 Android Viewer: Include native libs again (diff) | |
| download | core-f2180bdc20c76ca70eb39dcddfb7e0da98315aba.tar.gz core-f2180bdc20c76ca70eb39dcddfb7e0da98315aba.zip | |
Update paths in Makefile.in and android/.gitignore
commit 0dffc65236fbacf98047d6dbfc82b4efe7dd959b
Date: Fri Jun 5 08:59:26 2020 -0400
android: fix the build output directory
had changed the output directory, so adapt the paths in
.gitignore and Makefile.in accordingly.
Change-Id: I9c145e359e20167185ae2f7b055fa3b1dac870f8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98971
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
| -rw-r--r-- | Makefile.in | 4 | ||||
| -rw-r--r-- | android/.gitignore | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index 2f02914a8a82..7d12aff6ffa7 100644 --- a/Makefile.in +++ b/Makefile.in @@ -183,8 +183,8 @@ ifneq ($(CROSS_COMPILING),) rm -fr $(INSTDIR_FOR_BUILD) rm -fr $(WORKDIR_FOR_BUILD) ifeq ($(OS),ANDROID) - rm -fr $(SRCDIR)/android/source/obj - rm -fr $(SRCDIR)/android/source/jniLibs + rm -fr $(BUILDDIR)/android/obj + rm -fr $(BUILDDIR)/android/jniLibs rm -fr $(SRCDIR)/android/source/build rm -fr $(SRCDIR)/android/source/assets rm -fr $(SRCDIR)/android/source/assets_fullUI diff --git a/android/.gitignore b/android/.gitignore index 19c3690b3ab7..163145dd63fa 100644 --- a/android/.gitignore +++ b/android/.gitignore @@ -6,9 +6,9 @@ /source/build/ /source/captures/ /source/jni/Application.mk -/source/jniLibs/ +/jniLibs/ /source/liboSettings.gradle /source/local.properties /source/native-code.cxx -/source/obj/ +/obj/ /source/source.iml |