Adding gradle support and CI for android sample project

.github/workflows/actions.yml

@@ -1,5 +1,4 @@
 # Sharpmake GitHub Actions CI configuration
-
 name: build
 on:
   push:
@@ -249,8 +248,19 @@ jobs:
           codebase/temp/bin/mac_${{ matrix.configuration }}_fastbuild/exe
           xcodebuild -workspace codebase/temp/solutions/HelloXCode_mac.xcworkspace -configuration ${{ matrix.configuration }} -scheme exe_mac
           cd codebase/temp/bin/mac_${{ matrix.configuration }}
-          DYLD_LIBRARY_PATH=. ./exe
-
+          DYLD_LIBRARY_PATH=. ./exe   
+
+      - name: HelloAndroid ${{ matrix.configuration }}
+        if: runner.os == 'Windows'
+        working-directory: 'samples/HelloAndroid'
+        env: 
+            REMOVE_ANDROID_BUILD_TOOLS_VERSION: 31.0.0
+        run: | #Installed Build Tools revision 31.0.0 is corrupted. Need to remove and install again using the SDK Manager.
+          & $env:SHARPMAKE_EXE "/sources('HelloAndroid.main.sharpmake.cs')"
+          & $env:ANDROID_HOME/tools/bin/sdkmanager --uninstall "build-tools;${{ env.REMOVE_ANDROID_BUILD_TOOLS_VERSION }}"
+          & $env:COMPILE_BATCH codebase\temp\solutions\HelloAndroid_android_vs2019.sln "${{ matrix.configuration }}_NoBlob" "arm64_v8a"
+          & $env:COMPILE_BATCH codebase\temp\solutions\HelloAndroid_android_vs2019.sln "${{ matrix.configuration }}_NoBlob" "x86_64"
+
       - name: NetCore/DotNetCoreFrameworkHelloWorld ${{ matrix.configuration }}
         if: runner.os == 'Windows'
         working-directory: 'samples/NetCore/DotNetCoreFrameworkHelloWorld'

samples/HelloAndroid/HelloAndroid.CommonTarget.sharpmake.cs

@@ -44,7 +44,7 @@ public class CommonTarget : Sharpmake.ITarget
         public Blob Blob;
         public BuildSystem BuildSystem;
         public AndroidBuildTargets AndroidBuildTargets = AndroidBuildTargets.arm64_v8a | AndroidBuildTargets.x86_64;
-        public Android.AndroidBuildType androidBuildType = Android.AndroidBuildType.Ant;
+        public Android.AndroidBuildType AndroidBuildType = Android.AndroidBuildType.Gradle;
 
         public CommonTarget() { }
 
@@ -53,14 +53,16 @@ public class CommonTarget : Sharpmake.ITarget
             DevEnv devEnv,
             Optimization optimization,
             Blob blob,
-            BuildSystem buildSystem
+            BuildSystem buildSystem,
+            Android.AndroidBuildType androidBuildType
         )
         {
             Platform = platform;
             DevEnv = devEnv;
             Optimization = optimization;
             Blob = blob;
             BuildSystem = buildSystem;
+            AndroidBuildType = androidBuildType;
         }
 
         public override string Name
@@ -79,7 +81,9 @@ public override string Name
                     nameParts.Add(BuildSystem.ToString());
                 }
 
-                return string.Join(" ", nameParts);
+                //using underscore to join different name parts because gradle is not able to parse
+                //the names properly if we use space to join them
+                return string.Join("_", nameParts);
             }
         }
 
@@ -142,7 +146,8 @@ public static CommonTarget[] GetAndroidTargets()
                 DevEnv.vs2019,
                 Optimization.Debug | Optimization.Release,
                 Blob.NoBlob,
-                BuildSystem.Default
+                BuildSystem.Default,
+                Android.AndroidBuildType.Gradle
             );
 
             // make a fastbuild version of the target

samples/HelloAndroid/codebase/HelloAndroid.sharpmake.cs

@@ -12,24 +12,31 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+using System.IO;
 using Sharpmake;
 
 namespace HelloAndroid
 {
     [Sharpmake.Generate]
     public class HelloAndroidSolution : CommonSolution
     {
+        public string GradleRootPath = Path.Combine(Globals.TmpDirectory, @"..\..\gradle\root");
+
         public HelloAndroidSolution()
         {
             AddTargets(CommonTarget.GetDefaultTargets());
             Name = "HelloAndroid";
+
+            ExePackaging.DirectoryCopyResourceFiles(GradleRootPath, ExePackaging.AndroidPackageProjectsPath + @"\exepackaging");
         }
 
+
         public override void ConfigureAll(Configuration conf, CommonTarget target)
         {
             base.ConfigureAll(conf, target);
 
             conf.AddProject<ExePackaging>(target);
+            conf.SetStartupProject<ExePackaging>();
         }
     }
 }

samples/HelloAndroid/codebase/exe/exe.sharpmake.cs

@@ -44,9 +44,7 @@ public override void ConfigureAll(Configuration conf, CommonTarget target)
         public override void ConfigureAndroid(Configuration conf, CommonTarget target)
         {
             base.ConfigureAndroid(conf, target);
-
             conf.Output = Configuration.OutputType.Dll;
-
             // The short name(libxxx.so, xxx is the short name) of App executable .so has to match the name of the project
             // because we use one AndroidManifest.xml for all configuration in the sample.
             conf.TargetFileName = Name.ToLowerInvariant();
@@ -64,7 +62,9 @@ public class ExePackaging : AndroidPackageProject
 
         public string ResourceRootPath = Path.Combine(ProjectRootPath, "resources");
 
-        public static readonly string AndroidPackagingPath = Path.Combine(Globals.TmpDirectory, @"projects\exepackaging");
+        public string GradleAppRootPath = Path.Combine(ProjectRootPath, @"gradle\app");
+
+        public static readonly string AndroidPackageProjectsPath = Path.Combine(Globals.TmpDirectory, @"projects");
 
         public ExePackaging() : base(typeof(CommonTarget))
         {
@@ -87,12 +87,26 @@ public ExePackaging() : base(typeof(CommonTarget))
             SourceFilesExclude.Add("AndroidManifest.xml", "build.xml");
 
             AddTargets(CommonTarget.GetAndroidTargets());
+
+            //the plugin and gradle version are good and stable version to be used with Android libraries,
+            //we don't want to use the default version on VS(ver. 0.4.0 and 2.8 respectively) since it is quite old
+            GradlePlugin = "gradle:4.2.0";
+            GradleVersion = "6.7.1";
+
+            // Path to the Gradle template files
+            GradleTemplateFiles.Add(@"app\src\main\AndroidManifest.xml.template");
+            GradleTemplateFiles.Add(@"app\build.gradle.template");
+            GradleTemplateFiles.Add(@"build.gradle.template");
+            GradleTemplateFiles.Add(@"settings.gradle.template");
+            GradleTemplateFiles.Add(@"gradle\wrapper\gradle-wrapper.properties.template");
+
+            ResourceFiles.Add(@"app\src\main\res\values\strings.xml");
         }
 
         [Configure(Platform.android)]
         public void ConfigureAndroid(Project.Configuration conf, CommonTarget target)
         {
-            conf.Name = Name + "_[target.Optimization]_[target.AndroidBuildTargets]";
+            conf.Name = target.Name + "_[target.AndroidBuildTargets]";
             conf.ProjectPath = Path.Combine(ProjectRootPath, @"codebase\temp\projects\[project.Name]");
             conf.ProjectFileName = "[project.Name]_[target.DevEnv]_[target.Platform]";
 
@@ -112,10 +126,29 @@ public void ConfigureAndroid(Project.Configuration conf, CommonTarget target)
         public override void PostResolve()
         {
             base.PostResolve();
-            DirectoryCopyResourceFiles(ResourceRootPath, AndroidPackagingPath);
+
+            DirectoryCopyResourceFiles(GradleAppRootPath, Path.Combine(AndroidPackageProjectsPath, Name + "/app"));
+
+            string srcAppGradleFile = Path.Combine(AndroidPackageProjectsPath, Name + "/app/build.app.gradle.template");
+            string destAppGradleFile = Path.Combine(AndroidPackageProjectsPath, Name + "/app/build.gradle.template");
+
+            if (File.Exists(destAppGradleFile))
+            {
+                File.Delete(destAppGradleFile);
+            }
+
+            // rename gradle template file in app folder
+            File.Move(srcAppGradleFile, destAppGradleFile);
+
+            string MainFolderPath = Path.Combine(AndroidPackageProjectsPath, Name + "/app/src/main");
+            if (!Directory.Exists(MainFolderPath))
+            {
+                Directory.CreateDirectory(MainFolderPath);
+            }
+            DirectoryCopyResourceFiles(ResourceRootPath, MainFolderPath);
         }
 
-        private void DirectoryCopyResourceFiles(string sourceDirName, string destDirName)
+        public static void DirectoryCopyResourceFiles(string sourceDirName, string destDirName)
         {
             // Get the subdirectories for the specified directory.
             DirectoryInfo dir = new DirectoryInfo(sourceDirName);
@@ -144,6 +177,6 @@ private void DirectoryCopyResourceFiles(string sourceDirName, string destDirName
                 }
                 Util.ForceCopy(srcFile, destFile);
             }
-        }
+        }  
     }
 }

samples/HelloAndroid/gradle/app/build.app.gradle.template

@@ -0,0 +1,80 @@
+apply plugin: 'com.android.$(ConfigurationType)'
+
+android {
+    compileSdkVersion = $(AndroidAPILevelNumber)
+    buildToolsVersion = "$(AndroidBuildToolsVersion)"
+
+    defaultConfig.with {
+        $(ApplicationId)
+        minSdkVersion = 21
+        targetSdkVersion = 30
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+
+	flavorDimensions "version"
+    productFlavors {
+		create("arm8Debug_NoBlob_arm64_v8a") {
+            ndk.abiFilters.add("arm64-v8a")
+        }
+		create("arm8Release_NoBlob_arm64_v8a") {
+            ndk.abiFilters.add("arm64-v8a")
+        }
+		create("x86-64Debug_NoBlob_x86_64") {
+            ndk.abiFilters.add("x86_64")
+        }
+		create("x86-64Release_NoBlob_x86_64") {
+            ndk.abiFilters.add("x86_64")
+        }
+        create("all")
+    }
+
+	applicationVariants.all { variant ->
+        variant.outputs.each { output ->
+			def folder = "${variant.name}"
+
+			if(folder.length() > 26) {
+				def arm8NewName = "app-" + folder.substring(0,4) + "-" + variant.buildType.name + ".apk"
+				def x86NewName = "app-" + folder.substring(0,6) + "-" + variant.buildType.name + ".apk"
+				if(folder.substring(0, 9) == "arm8Debug")
+				{
+					output.outputFileName = "../../ARM8/Debug_NoBlob_arm64_v8a/" + arm8NewName
+				}
+				else if (folder.substring(0, 11) == "arm8Release")
+				{
+					output.outputFileName = "../../ARM8/Release_NoBlob_arm64_v8a/" + arm8NewName
+				}
+				else if (folder.substring(0, 11) == "x86-64Debug")
+				{
+					output.outputFileName = "../../x86-64/Debug_NoBlob_x86_64/" + x86NewName
+				}
+				else if (folder.substring(0, 13) == "x86-64Release")
+				{
+					output.outputFileName = "../../x86-64/Release_NoBlob_x86_64/" + x86NewName
+				}
+				println output.outputFileName
+			}
+        }
+    }
+}
+
+repositories {
+    flatDir {
+        dirs 'libs'
+    }
+}
+
+dependencies {
+    compile fileTree(dir: 'libs', include: ['*.jar'])
+    $(AarDependencies)
+}

samples/HelloAndroid/gradle/root/build.gradle

@@ -0,0 +1,24 @@
+apply plugin: 'base'
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+       google()
+       jcenter()
+       mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:4.2.0'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        mavenCentral()
+    }
+}

samples/HelloAndroid/gradle/root/build.gradle.template

@@ -0,0 +1,24 @@
+apply plugin: 'base'
+// Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+       google()
+       jcenter()
+       mavenCentral()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:$(GradlePlugin)'
+
+        // NOTE: Do not place your application dependencies here; they belong
+        // in the individual module build.gradle files
+    }
+}
+
+allprojects {
+    repositories {
+        google()
+        jcenter()
+        mavenCentral()
+    }
+}

samples/HelloAndroid/gradle/root/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip

samples/HelloAndroid/gradle/root/gradle/wrapper/gradle-wrapper.properties.template

@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-$(GradleVersion)-all.zip