strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update paths in Makefile.in and android/.gitignore

Browse source 
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>
This commit is contained in:
Michael Weghorn 2020-07-17 09:33:31 +02:00
parent bc6c034ba0
commit f2180bdc20
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile.in
View file

@ -183,8 +183,8 @@ ifneq ($(CROSS_COMPILING),)
rm -fr $(INSTDIR_FOR_BUILD) rm -fr $(INSTDIR_FOR_BUILD)
rm -fr $(WORKDIR_FOR_BUILD) rm -fr $(WORKDIR_FOR_BUILD)
ifeq ($(OS),ANDROID) ifeq ($(OS),ANDROID)
rm -fr $(SRCDIR)/android/source/obj rm -fr $(BUILDDIR)/android/obj
rm -fr $(SRCDIR)/android/source/jniLibs rm -fr $(BUILDDIR)/android/jniLibs
rm -fr $(SRCDIR)/android/source/build rm -fr $(SRCDIR)/android/source/build
rm -fr $(SRCDIR)/android/source/assets rm -fr $(SRCDIR)/android/source/assets
rm -fr $(SRCDIR)/android/source/assets_fullUI rm -fr $(SRCDIR)/android/source/assets_fullUI

4
android/.gitignore vendored
View file

@ -6,9 +6,9 @@
/source/build/ /source/build/
/source/captures/ /source/captures/
/source/jni/Application.mk /source/jni/Application.mk
/source/jniLibs/ /jniLibs/
/source/liboSettings.gradle /source/liboSettings.gradle
/source/local.properties /source/local.properties
/source/native-code.cxx /source/native-code.cxx
/source/obj/ /obj/
/source/source.iml /source/source.iml