@@ -129,7 +129,7 @@ android {
129129tasks. register(' updateLibraryThenExit' , Exec ) {
130130 executable = ' node'
131131 workingDir = projectDir
132- args = [' -e ' , " require('./libv8-services').updateLibraryThenExit() " ]
132+ args = [' libv8-services.js ' , ' update-library ' ]
133133}
134134
135135// Downloads/extracts V8 library and creates a cmake file for it. To be executed before C/C++ "build" or "clean".
@@ -151,13 +151,6 @@ tasks.register('updateV8Library') {
151151 " set(LIBV8_VERSION \" ${ packageJson.v8.version} \" )" ,
152152 " set(LIBV8_MODE \" ${ packageJson.v8.mode} \" )"
153153 ]. join(' \n ' ) + ' \n '
154-
155- // Download/install the V8 library referenced in our "package.json", if not already done.
156- exec {
157- executable = ' node'
158- workingDir = projectDir
159- args = [' libv8-services.js' , ' update-library' ]
160- }
161154 }
162155}
163156
@@ -192,7 +185,7 @@ tasks.register('checkstyleChanged', Checkstyle) {
192185tasks. register(' createV8Snapshot' , Exec ) {
193186 executable = ' node'
194187 workingDir = projectDir
195- args = [' -e ' , " require('./libv8-services').createSnapshotThenExit() " ]
188+ args = [' libv8-services.js ' , ' create-snapshot ' ]
196189}
197190
198191tasks. register(' snapshotTiCommonFiles' ) {
@@ -201,26 +194,19 @@ tasks.register('snapshotTiCommonFiles') {
201194 inputs. file " ${ projectDir} /../../build/lib/builder.js"
202195 inputs. file " ${ projectDir} /../../build/lib/android.js"
203196 outputs. file " ${ projectDir} /../runtime/v8/generated/V8Snapshots.h"
204- doFirst {
205- exec {
206- executable = ' node'
207- workingDir = projectDir
208- args = [' libv8-services.js' , ' create-snapshot' ]
209- }
210- }
211197}
212198
213199// Runs our "prebuild.js" script before the C/C++ compile, but after Java compile. (Mid-build script?)
214200// Generates C/C++ files providing our Android-only JS files via byte arrays.
215201tasks. register(' runPrebuild' , Exec ) {
216- executable = ' node'
217- workingDir = projectDir
218- args = [' prebuild.js' ]
202+ executable = ' node'
203+ workingDir = projectDir
204+ args = [' prebuild.js' ]
219205}
220206
221207tasks. withType(JavaCompile ). configureEach {
222- dependsOn(checkJavaStyle, snapshotTiCommonFiles)
223- finalizedBy(tasks. runPrebuild)
208+ dependsOn(checkJavaStyle, snapshotTiCommonFiles)
209+ finalizedBy(tasks. runPrebuild)
224210}
225211
226212// Set up project to compile Java side before compiling the C/C++ side.
@@ -280,17 +266,17 @@ def getChangedFiles() {
280266
281267def generatedDir = file(" ${ projectDir} /../runtime/v8/generated" )
282268def distFiles = fileTree(
283- dir : file(" ${ projectDir} /../../dist/android" ),
284- include : ' **/*' ,
285- exclude : ' libv8/**/*'
269+ dir : file(" ${ projectDir} /../../dist/android" ),
270+ include : ' **/*' ,
271+ exclude : ' libv8/**/*'
286272)
287273
288274clean. doLast {
289- // Delete generated C/C++ files.
290- delete generatedDir
275+ // Delete generated C/C++ files.
276+ delete generatedDir
291277
292- // Delete the files copied to our distribution directory.
293- delete distFiles
278+ // Delete the files copied to our distribution directory.
279+ delete distFiles
294280}
295281
296282dependencies {
0 commit comments