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

Commit 07483c0

committed

Exclude the snapshotted bundle from the apk even when blobs are used

1 parent 39f08e4 commit 07483c0Copy full SHA for 07483c0

File tree

2 files changed

-7

lines changed

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

2 files changed

-7

lines changed

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

Lines changed: 6 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -53,27 +53,27 @@ ProjectSnapshotGenerator.installSnapshotArtefacts = function(projectRoot) {`
`53`	`53`	`const buildPath = ProjectSnapshotGenerator.calculateBuildPath(projectRoot);`
`54`	`54`	`const platformPath = path.join(projectRoot, "platforms/android");`
`55`	`55`	`const assetsPath = path.join(platformPath, "src/main/assets");`
	`56`	`+ const configDestinationPath = path.join(platformPath, "configurations", SnapshotGenerator.SNAPSHOT_PACKAGE_NANE);`
`56`	`57`
`57`	`58`	`// Remove build folder to make sure that the apk will be fully rebuild`
`58`	`59`	`shelljs.rm("-rf", path.join(platformPath, "build"));`
`59`	`60`
	`61`	`+ // Copy include.gradle to the specified destination in the platforms folder`
	`62`	`+ shelljs.mkdir("-p", configDestinationPath);`
	`63`	`+ shelljs.cp(path.join(buildPath, "include.gradle"), path.join(configDestinationPath, "include.gradle"));`
	`64`	`+`
`60`	`65`	`// Copy tns-java-classes.js`
`61`	`66`	`if (shelljs.test("-e", path.join(buildPath, "tns-java-classes.js"))) {`
`62`	`67`	`shelljs.cp(path.join(buildPath, "tns-java-classes.js"), path.join(assetsPath, "app/tns-java-classes.js"));`
`63`	`68`	`}`
`64`	`69`
`65`	`70`	`if (shelljs.test("-e", path.join(buildPath, "ndk-build/libs"))) {`
`66`	`71`	`// useLibs = true`
`67`		`- const libsDestinationPath = path.join(projectRoot, "platforms/android/src", SnapshotGenerator.SNAPSHOT_PACKAGE_NANE, "jniLibs");`
`68`		`- const configDestinationPath = path.join(projectRoot, "platforms/android/configurations", SnapshotGenerator.SNAPSHOT_PACKAGE_NANE);`
	`72`	`+ const libsDestinationPath = path.join(platformPath, "src", SnapshotGenerator.SNAPSHOT_PACKAGE_NANE, "jniLibs");`
`69`	`73`
`70`	`74`	`// Copy the libs to the specified destination in the platforms folder`
`71`	`75`	`shelljs.mkdir("-p", libsDestinationPath);`
`72`	`76`	`shelljs.cp("-R", path.join(buildPath, "ndk-build/libs") + "/", libsDestinationPath);`
`73`		`-`
`74`		`- // Copy include.gradle to the specified destination in the platforms folder`
`75`		`- shelljs.mkdir("-p", configDestinationPath);`
`76`		`- shelljs.cp(path.join(buildPath, "include.gradle"), path.join(configDestinationPath, "include.gradle"));`
`77`	`77`	`}`
`78`	`78`	`else {`
`79`	`79`	`// useLibs = false`

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

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -175,10 +175,10 @@ SnapshotGenerator.prototype.generate = function(options) {`
`175`	`175`
`176`	`176`	`// generates the actual .blob and .c files`
`177`	`177`	`return this.runMksnapshotTool(options.snapshotToolsPath, preprocessedInputFile, options.v8Version, options.targetArchs, options.useLibs).then(() => {`
	`178`	`+ this.buildIncludeGradle();`
`178`	`179`	`if (options.useLibs) {`
`179`	`180`	`const androidNdkBuildPath = options.androidNdkPath ? path.join(options.androidNdkPath, "ndk-build") : "ndk-build";`
`180`	`181`	`this.buildSnapshotLibs(androidNdkBuildPath, options.targetArchs);`
`181`		`- this.buildIncludeGradle();`
`182`	`182`	`}`
`183`	`183`	`return this.buildPath;`
`184`	`184`	`});`

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 07483c0

File tree

2 files changed

2 files changed

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

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

0 commit comments