Android. Rename source module to app

According to documentation
https://developer.android.com/build/android-build-structure
the root module should be named "app".
So the source module was renamed.

Change-Id: I1d8e239ab2df54cc294aa7da0a9746a87952bb3c

Makefile.in

@@ -207,10 +207,10 @@ ifneq ($(CROSS_COMPILING),)
 ifeq ($(OS),ANDROID)
 	rm -fr $(BUILDDIR)/android/obj
 	rm -fr $(BUILDDIR)/android/jniLibs
-	rm -fr $(SRCDIR)/android/source/build
+	rm -fr $(SRCDIR)/android/app/build
-	rm -fr $(SRCDIR)/android/source/assets
+	rm -fr $(SRCDIR)/android/app/assets
-	rm -fr $(SRCDIR)/android/source/assets_strippedUI
+	rm -fr $(SRCDIR)/android/app/assets_strippedUI
-	rm -fr $(SRCDIR)/android/source/res_generated
+	rm -fr $(SRCDIR)/android/app/res_generated
 endif
 endif
 

README.cross

@@ -165,7 +165,7 @@ And here is an (quite old) autogen.input for Android on X86:
 --with-distro=LibreOfficeAndroidX86
 
 A LibreOffice app for Android is being developed progress in the
-android/source directory.
+android/app directory.
 
 To run the app, do "make install" followed by either "make run" or
 starting it from Android itself. You most likely want to have an "adb logcat"

android/.gitignore

@@ -2,14 +2,14 @@
 /.gradle
 /.idea
 /local.properties
-/source/assets/
+/app/assets/
-/source/assets_strippedUI/
+/app/assets_strippedUI/
-/source/build/
+/app/build/
-/source/captures/
+/app/captures/
-/source/jni/Application.mk
+/app/jni/Application.mk
-/source/res_generated
+/app/res_generated
 /jniLibs/
-/source/liboSettings.gradle.kts
+/app/liboSettings.gradle.kts
-/source/native-code.cxx
+/app/native-code.cxx
 /obj/
-/source/source.iml
+/app/source.iml

android/CustomTarget_lo_android.mk

@@ -8,7 +8,7 @@
 
 $(eval $(call gb_CustomTarget_CustomTarget,android/loandroid3))
 
-loandroid3_DIR := $(gb_CustomTarget_workdir)/android/source
+loandroid3_DIR := $(gb_CustomTarget_workdir)/android/app
 
 $(call gb_CustomTarget_get_target,android/loandroid3) : \
 	$(loandroid3_DIR)/done
@@ -17,18 +17,18 @@ $(loandroid3_DIR)/done : $(call gb_Postprocess_get_target,AllModulesButInstsetNa
 	$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),MAK,2)
 	$(call gb_Trace_StartRange,$(subst $(WORKDIR)/,,$@),MAK)
 	cd $(SRCDIR)/android && $(MAKE) local.properties
-	cd $(SRCDIR)/android/source && $(MAKE) all
+	cd $(SRCDIR)/android/app && $(MAKE) all
 ifeq ($(ENABLE_JAVA),TRUE)
 # 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; \
-	if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then cp $(SRCDIR)/android/source/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/$(if $(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,debug/*-debug.apk) $(BUILDDIR)/instsetoo_native/foo/bin ; fi
+	if test "$$ENABLE_ANDROID_LOK" != "TRUE" ; then cp $(SRCDIR)/android/app/build/outputs/apk/strippedUI$(if $(ENABLE_ANDROID_EDITING),Editing)/$(if $(ENABLE_RELEASE_BUILD),release/*-release-unsigned.apk,debug/*-debug.apk) $(BUILDDIR)/instsetoo_native/foo/bin ; fi
 	$(call gb_Trace_EndRange,$(subst $(WORKDIR)/,,$@),MAK)
 endif
 
 $(call gb_CustomTarget_get_clean_target,android/loandroid3) :
 	$(call gb_Output_announce,$(subst $(WORKDIR)/Clean/,,$@),$(false),MAK,2)
-	cd $(SRCDIR)/android/source && $(MAKE) clean
+	cd $(SRCDIR)/android/app && $(MAKE) clean
 
 # vim: set noet sw=4 ts=4:

android/Makefile

@@ -12,7 +12,7 @@ include $(module_directory)/../solenv/gbuild/partial_build.mk
 
 .PHONY: sign
 
-SIGNED_APK := $(BUILDDIR)/android/source/bin/LibreOfficeViewer.apk
+SIGNED_APK := $(BUILDDIR)/android/app/bin/LibreOfficeViewer.apk
 RELEASE_APK_USAGE := echo; echo "Usage: make versionCode=<version_num+1> key=<key_name> release-apk"
 
 local.properties: $(BUILDDIR)/config_host.mk
@@ -26,8 +26,8 @@ release-apk: build
 	rm -f $(SIGNED_APK)
 
 	# the actual signing
-	jarsigner --verbose -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ~/.keystore $(BUILDDIR)/android/source/build/outputs/apk/LibreOfficeViewer-strippedUI-release-unsigned.apk $(key)
+	jarsigner --verbose -verbose -sigalg SHA1withRSA -digestalg SHA1 -keystore ~/.keystore $(BUILDDIR)/android/app/build/outputs/apk/LibreOfficeViewer-strippedUI-release-unsigned.apk $(key)
-	$(ANDROID_SDK_DIR)/build-tools/*/zipalign -v 4 $(BUILDDIR)/android/source/build/outputs/apk/LibreOfficeViewer-strippedUI-release-unsigned.apk $(SIGNED_APK)
+	$(ANDROID_SDK_DIR)/build-tools/*/zipalign -v 4 $(BUILDDIR)/android/app/build/outputs/apk/LibreOfficeViewer-strippedUI-release-unsigned.apk $(SIGNED_APK)
 
 	@echo
 	@echo "Resulting signed apk: $(SIGNED_APK)"

android/README.md

@@ -6,7 +6,7 @@ Contains common code for all projects on Android to bootstrap LibreOffice. In
 addition it is a home to `LibreOfficeKit` (LOK - see `libreofficekit/README.md`) JNI
 classes.
 
-## Stuff in Source Directory
+## Stuff in App Directory
 
 LibreOffice Android application - the code is based on Fennec (Firefox for Android).
 It uses OpenGL ES 2 for rendering of the document tiles which are gathered from
@@ -163,7 +163,7 @@ For instructions on how to build for Android, see `README.cross`.
 
 Attach your device, so 'adb devices' shows it. Then run:
 
-        cd android/source
+        cd android/app
         make install
         adb logcat
 
@@ -236,7 +236,7 @@ Using `lldb` from within Android Studio is more comfortable though and works lik
 - open `android` directory in Android Studio via File|Open...
 - make sure you select the right build variant (`strippedUIDebug` is what you want)
 - use Run|Edit Configurations to create a new configuration of type "Android Native"
-	- on tab "General" pick module "source"
+	- on tab "General" pick module "app"
 	- on tab "Native Debugger" add `android/obj/local/<hostarch>` to
 	the Symbol directories
 	- on the LLDB startup commands tab add
@@ -323,7 +323,7 @@ heavy lifting.
 
 ## Triple-T metadata for F-Droid
 
-The subdirectory `source/src/main/play` contains data in the Triple-T
+The subdirectory `app/src/main/play` contains data in the Triple-T
 structure that F-Droid evaluates to extract metadata.
 
 More information: