This repository was archived by the owner on Aug 7, 2021. It is now read-only.

Commit 20d496a

committed

Respect ANDROID_NDK_HOME env variable in case androidNdkPath is not specified

1 parent 07483c0 commit 20d496aCopy full SHA for 20d496a

File tree

1 file changed

-2

lines changed

snapshot/android
- project-snapshot-generator.js

1 file changed

-2

lines changed

`‎snapshot/android/project-snapshot-generator.js‎`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -155,7 +155,7 @@ ProjectSnapshotGenerator.prototype.generate = function(generationOptions) {`
`155`	`155`	`shelljs.mkdir("-p", this.getBuildPath());`
`156`	`156`
`157`	`157`	`// Generate tns-java-classes.js if needed`
`158`		`- var tnsJavaClassesDestination = path.join(this.getBuildPath(), "tns-java-classes.js");`
	`158`	`+ const tnsJavaClassesDestination = path.join(this.getBuildPath(), "tns-java-classes.js");`
`159`	`159`	`if (generationOptions.tnsJavaClassesPath) {`
`160`	`160`	`if (generationOptions.tnsJavaClassesPath != tnsJavaClassesDestination) {`
`161`	`161`	`shelljs.cp(generationOptions.tnsJavaClassesPath, tnsJavaClassesDestination);`
`@@ -171,6 +171,8 @@ ProjectSnapshotGenerator.prototype.generate = function(generationOptions) {`
`171`	`171`	`path.resolve(process.cwd(), generationOptions.snapshotToolsPath)) :`
`172`	`172`	`path.join(os.tmpdir(), "snapshot-tools");`
`173`	`173`
	`174`	`+ const androidNdkPath = generationOptions.androidNdkPath \|\| process.env.ANDROID_NDK_HOME;`
	`175`	`+`
`174`	`176`	`console.log("Snapshot tools path: " + snapshotToolsPath);`
`175`	`177`
`176`	`178`	`// Generate snapshots`
`@@ -182,7 +184,7 @@ ProjectSnapshotGenerator.prototype.generate = function(generationOptions) {`
`182`	`184`	`v8Version: generationOptions.v8Version \|\| this.getV8Version(),`
`183`	`185`	`preprocessedInputFile: generationOptions.preprocessedInputFile,`
`184`	`186`	`useLibs: generationOptions.useLibs \|\| false,`
`185`		`- androidNdkPath: generationOptions.androidNdkPath`
	`187`	`+ androidNdkPath`
`186`	`188`	`}).then(() => {`
`187`	`189`	`console.log("Snapshots build finished succesfully!");`
`188`	`190`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 20d496a

File tree

1 file changed

1 file changed

`‎snapshot/android/project-snapshot-generator.js‎`

0 commit comments