fix: better fix for custom build folder so that it works too in android studio. (i still pass projectRoot in gradle in case we need it). This fix is not used with plugins build though as it seems better to use projectRoot

Author: farfromrefuge

lib/services/android-project-service.ts

@@ -465,10 +465,11 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			this.getPlatformData(projectData).projectRoot,
 			"settings.gradle"
 		);
+		const relativePath =  path.relative(this.getPlatformData(projectData).projectRoot, projectData.projectDir)
 		shell.sed(
 			"-i",
 			/def USER_PROJECT_ROOT = \"\$rootDir\/..\/..\/\"/,
-			'def USER_PROJECT_ROOT = System.getProperties().projectRoot != null ? System.getProperties().projectRoot : "$rootDir/../../"',
+			`def USER_PROJECT_ROOT = "$rootDir/${relativePath}"`,
 			gradleSettingsFilePath
 		);
 
@@ -527,7 +528,6 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 		);
 		const buildGradlePath = path.join(
 			this.getPlatformData(projectData).projectRoot,
-			"app",
 			"build.gradle"
 		);
 		shell.sed(
@@ -536,10 +536,11 @@ export class AndroidProjectService extends projectServiceBaseLib.PlatformProject
 			projectData.projectIdentifiers.android,
 			buildGradlePath
 		);
+		const relativePath =  path.relative(this.getPlatformData(projectData).projectRoot, projectData.projectDir)
 		shell.sed(
 			"-i",
 			/project.ext.USER_PROJECT_ROOT = \"\$rootDir\/..\/..\"/,
-			'project.ext.USER_PROJECT_ROOT = System.getProperties().projectRoot != null ? System.getProperties().projectRoot : "$rootDir/../../"',
+			`project.ext.USER_PROJECT_ROOT = "$rootDir/${relativePath}"`,
 			buildGradlePath
 		);
 	}

vendor/gradle-app/build.gradle

@@ -45,7 +45,7 @@ version of the {N} CLI install a previous version of the runtime package - 'tns
 
         project.ext.nativescriptDependencies = new JsonSlurper().parseText(dependenciesJson.text)
         project.ext.PLATFORMS_ANDROID = "platforms/android"
-        project.ext.USER_PROJECT_ROOT = System.getProperties().projectRoot != null ? System.getProperties().projectRoot : "$rootDir/../../"
+        project.ext.USER_PROJECT_ROOT = "$rootDir/../.."
 
         project.ext.getAppPath = { ->
             def relativePathToApp = "app"

vendor/gradle-app/settings.gradle

@@ -14,14 +14,7 @@ import org.gradle.internal.logging.text.StyledTextOutputFactory
 import groovy.json.JsonSlurper
 import static org.gradle.internal.logging.text.StyledTextOutput.Style
 
-def getProjectRoot = { ->
-    def projectRoot = "$rootDir/../../"
-    if (System.getProperties().projectRoot != null) {
-        projectRoot = System.getProperties().projectRoot
-    }
-    return projectRoot
-}
-def USER_PROJECT_ROOT = getProjectRoot()
+def USER_PROJECT_ROOT = "$rootDir/../../"
 def outLogger = services.get(StyledTextOutputFactory).create("colouredOutputLogger")
 def ext  = {
     appResourcesPath = getProperty("appResourcesPath")