Merge pull request #31705 from akien-mga/android-format-build-files

Android: Style fixes to manifest and build.gradle

2 files changed, 119 insertions, 106 deletions

diff --git a/platform/android/java/AndroidManifest.xml b/platform/android/java/AndroidManifest.xml
index 3152ef12cd..5114aeb8c5 100644
--- a/platform/android/java/AndroidManifest.xml
+++ b/platform/android/java/AndroidManifest.xml
@@ -1,58 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:tools="http://schemas.android.com/tools"
-      package="com.godot.game"
-      android:versionCode="1"
-      android:versionName="1.0"
-      android:installLocation="auto"
-      >
-<supports-screens android:smallScreens="true"
-                      android:normalScreens="true"
-                      android:largeScreens="true"
-                      android:xlargeScreens="true"/>
-
-<!--glEsVersion is modified by the exporter, changing this value here has no effect-->
-    <uses-feature android:glEsVersion="0x00020000" android:required="true" />
-<!--Adding custom text to manifest is fine, but do it outside the custom user and application BEGIN/END regions, as that gets rewritten-->
-
-<!--Custom permissions XML added by add-ons. It's recommended to add them from the export preset, though-->
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.godot.game"
+    android:versionCode="1"
+    android:versionName="1.0"
+    android:installLocation="auto" >
+
+    <!-- Adding custom text to the manifest is fine, but do it outside the custom USER and APPLICATION BEGIN/END comments, -->
+    <!-- as that gets rewritten. -->
+
+    <supports-screens
+        android:smallScreens="true"
+        android:normalScreens="true"
+        android:largeScreens="true"
+        android:xlargeScreens="true" />
+
+    <!-- glEsVersion is modified by the exporter, changing this value here has no effect. -->
+    <uses-feature
+        android:glEsVersion="0x00020000"
+        android:required="true" />
+
+<!-- Custom user permissions XML added by add-ons. It's recommended to add them from the export preset, though. -->
 <!--CHUNK_USER_PERMISSIONS_BEGIN-->
 <!--CHUNK_USER_PERMISSIONS_END-->
 
-<!--Anything in this line after the icon will be erased when doing custom build. If you want to add tags manually, do before it.-->
-    <application android:label="@string/godot_project_name_string" android:allowBackup="false" tools:ignore="GoogleAppIndexingWarning" android:icon="@drawable/icon">
+    <!-- Any tag in this line after android:icon will be erased when doing custom builds. -->
+    <!-- If you want to add tags manually, do before it. -->
+    <application
+        android:label="@string/godot_project_name_string"
+        android:allowBackup="false"
+        tools:ignore="GoogleAppIndexingWarning"
+        android:icon="@drawable/icon" >
 
-<!--The following values are replaced when Godot exports, modifying them here has no effect. Do these changes in the-->
-<!--export preset. Adding new ones is fine.-->
+        <!-- The following metadata values are replaced when Godot exports, modifying them here has no effect. -->
+        <!-- Do these changes in the export preset. Adding new ones is fine. -->
 
-<!-- XR mode metadata. This is modified by the exporter based on the selected xr mode. DO NOT CHANGE the values here. -->
-        <meta-data android:name="xr_mode_metadata_name" android:value="xr_mode_metadata_value"/>
+        <!-- XR mode metadata. This is modified by the exporter based on the selected xr mode. DO NOT CHANGE the values here. -->
+        <meta-data
+            android:name="xr_mode_metadata_name"
+            android:value="xr_mode_metadata_value" />
 
-        <activity android:name="org.godotengine.godot.Godot"
-                  android:label="@string/godot_project_name_string"
-                  android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
-                  android:launchMode="singleTask"
-                  android:screenOrientation="landscape"
-                  android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
-                  android:resizeableActivity="false"
-                  tools:ignore="UnusedAttribute">
+        <activity
+            android:name="org.godotengine.godot.Godot"
+            android:label="@string/godot_project_name_string"
+            android:theme="@android:style/Theme.Black.NoTitleBar.Fullscreen"
+            android:launchMode="singleTask"
+            android:screenOrientation="landscape"
+            android:configChanges="orientation|keyboardHidden|screenSize|smallestScreenSize|density|keyboard|navigation|screenLayout|uiMode"
+            android:resizeableActivity="false"
+            tools:ignore="UnusedAttribute" >
 
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-    <service android:name="org.godotengine.godot.GodotDownloaderService" />
 
-<!--Custom application XML added by add-ons-->
+        <service android:name="org.godotengine.godot.GodotDownloaderService" />
+
+<!-- Custom application XML added by add-ons. -->
 <!--CHUNK_APPLICATION_BEGIN-->
 <!--CHUNK_APPLICATION_END-->
 
     </application>
 
-    <instrumentation android:icon="@drawable/icon"
-                     android:label="@string/godot_project_name_string"
-                     android:name="org.godotengine.godot.GodotInstrumentation"
-                     android:targetPackage="org.godotengine.game" />
+    <instrumentation
+        android:icon="@drawable/icon"
+        android:label="@string/godot_project_name_string"
+        android:name="org.godotengine.godot.GodotInstrumentation"
+        android:targetPackage="org.godotengine.game" />
 
 </manifest>
diff --git a/platform/android/java/build.gradle b/platform/android/java/build.gradle
index 620128fc94..0f8499ba91 100644
--- a/platform/android/java/build.gradle
+++ b/platform/android/java/build.gradle
@@ -1,113 +1,111 @@
-//Gradle project for Godot Engine Android port.
-//Do not modify code between the BEGIN/END sections, as it's autogenerated by add-ons
+// Gradle build config for Godot Engine's Android port.
+//
+// Do not remove/modify comments ending with BEGIN/END, they are used to inject
+// addon-specific configuration.
 
 buildscript {
-	repositories {
-		google()
-		jcenter()
+    repositories {
+        google()
+        jcenter()
 //CHUNK_BUILDSCRIPT_REPOSITORIES_BEGIN
 //CHUNK_BUILDSCRIPT_REPOSITORIES_END
-	}
-	dependencies {
-		classpath 'com.android.tools.build:gradle:3.4.2'
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.4.2'
 //CHUNK_BUILDSCRIPT_DEPENDENCIES_BEGIN
 //CHUNK_BUILDSCRIPT_DEPENDENCIES_END
-	}
+    }
 }
 
 apply plugin: 'com.android.application'
 
 allprojects {
     repositories {
-	mavenCentral()
-	google()
-	jcenter()
+        mavenCentral()
+        google()
+        jcenter()
 //CHUNK_ALLPROJECTS_REPOSITORIES_BEGIN
 //CHUNK_ALLPROJECTS_REPOSITORIES_END
-
     }
 }
 
 dependencies {
-	implementation "com.android.support:support-core-utils:28.0.0"
+    implementation "com.android.support:support-core-utils:28.0.0"
 //CHUNK_DEPENDENCIES_BEGIN
 //CHUNK_DEPENDENCIES_END
 }
 
 android {
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
+    useLibrary 'org.apache.http.legacy'
 
-	lintOptions {
-		abortOnError false
-		disable 'MissingTranslation','UnusedResources'
-	}
-
-	compileSdkVersion 28
-	buildToolsVersion "28.0.3"
-	useLibrary 'org.apache.http.legacy'
-
-	packagingOptions {
-		exclude 'META-INF/LICENSE'
-		exclude 'META-INF/NOTICE'
-	}
-	defaultConfig {
-		minSdkVersion 18
-		targetSdkVersion 28
+    defaultConfig {
+        minSdkVersion 18
+        targetSdkVersion 28
 //CHUNK_ANDROID_DEFAULTCONFIG_BEGIN
 //CHUNK_ANDROID_DEFAULTCONFIG_END
-	}
-	// Both signing and zip-aligning will be done at export time
-	buildTypes.all { buildType ->
-		buildType.zipAlignEnabled false
-		buildType.signingConfig null
-	}
-	sourceSets {
-		main {
-			manifest.srcFile 'AndroidManifest.xml'
-			java.srcDirs = ['src'
+    }
+
+    lintOptions {
+        abortOnError false
+        disable 'MissingTranslation', 'UnusedResources'
+    }
+
+    packagingOptions {
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/NOTICE'
+    }
+
+    // Both signing and zip-aligning will be done at export time
+    buildTypes.all { buildType ->
+        buildType.zipAlignEnabled false
+        buildType.signingConfig null
+    }
+
+    sourceSets {
+        main {
+            manifest.srcFile 'AndroidManifest.xml'
+            java.srcDirs = [
+                'src'
 //DIR_SRC_BEGIN
 //DIR_SRC_END
-			]
-			res.srcDirs = [
-				'res'
+            ]
+            res.srcDirs = [
+                'res'
 //DIR_RES_BEGIN
 //DIR_RES_END
-			]
-			aidl.srcDirs = [
-				'aidl'
+            ]
+            aidl.srcDirs = [
+                'aidl'
 //DIR_AIDL_BEGIN
 //DIR_AIDL_END
-			]
-			assets.srcDirs = [
-				'assets'
+            ]
+            assets.srcDirs = [
+                'assets'
 //DIR_ASSETS_BEGIN
 //DIR_ASSETS_END
-
-			]
-		}
-		debug.jniLibs.srcDirs = [
-			'libs/debug'
+            ]
+        }
+        debug.jniLibs.srcDirs = [
+            'libs/debug'
 //DIR_JNI_DEBUG_BEGIN
 //DIR_JNI_DEBUG_END
-		]
-		release.jniLibs.srcDirs = [
-			'libs/release'
+        ]
+        release.jniLibs.srcDirs = [
+            'libs/release'
 //DIR_JNI_RELEASE_BEGIN
 //DIR_JNI_RELEASE_END
-		]
-	}
-// No longer used, as it's not useful for build source template
-//	applicationVariants.all { variant ->
-//		variant.outputs.all { output ->
-//			output.outputFileName = "../../../../../../../bin/android_${variant.name}.apk"
-//		}
-//	}
+        ]
+    }
 
+    // No longer used, as it's not useful for build source template
+    //applicationVariants.all { variant ->
+    //    variant.outputs.all { output ->
+    //        output.outputFileName = "../../../../../../../bin/android_${variant.name}.apk"
+    //    }
+    //}
 }
 
 //CHUNK_GLOBAL_BEGIN
 //CHUNK_GLOBAL_END
-
-
-
-
-