Update paths in Makefile.in and android/.gitignore

commit 0dffc65236
    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>

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

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