Permalink
Browse files

Duplicated parameter removed

Summary: Removed a parameter which was a duplicate

Reviewed By: kirwan

Differential Revision: D4320033

fbshipit-source-id: b018a682b0238651aa66232e1d58d25ffe09fbfa
  • Loading branch information...
1 parent caa59e3 commit a3ab88cb90278225b1ff2d6faa7b8b28711f7d41 @massimocarli massimocarli committed with Facebook Github Bot Dec 13, 2016
Showing with 3 additions and 7 deletions.
  1. +3 −7 build.gradle
View
@@ -153,7 +153,7 @@ subprojects {
mergeDir.mkdirs()
}
- ext.createNativeLibrariesTasks = {name, libraryUrl, libraryFileName, libraryDestinationDir, sourceDir1, sourceDir2, includePaths, destinationDir ->
+ ext.createNativeLibrariesTasks = {name, libraryUrl, libraryFileName, libraryDestinationDir, sourceDir, includePaths, destinationDir ->
// We create the DownloadTask
tasks.create("download${name}", Download) {
src libraryUrl
@@ -171,8 +171,8 @@ subprojects {
// The copy task
Task unpackTask = tasks.getByName("unpack${name}")
tasks.create("copy${name}", Copy) {
- from "${unpackTask.destinationDir}/${sourceDir1}"
- from "src/main/jni/third-party/${sourceDir2}"
+ from "${unpackTask.destinationDir}/${sourceDir}"
+ from "src/main/jni/third-party/${destinationDir}"
include(includePaths)
into "${mergeDir}/${destinationDir}"
dependsOn "unpack${name}"
@@ -187,7 +187,6 @@ subprojects {
'1.5.0.tar.gz', // The downloaded file
'libjpeg', // The folder where the file is downloaded
'libjpeg-turbo-1.5.0', // The first dir where we have put our customisation
- 'libjpeg-turbo-1.5.x', // The folder for the merge
['**/*.c', '**/*.h','**/*.S', '**/*.asm', '**/*.inc', '*.mk'], // Files to compile
'libjpeg-turbo-1.5.x' // Final destination dir
)
@@ -199,7 +198,6 @@ subprojects {
'v1.6.10.tar.gz', // The downloaded file
'libpng', // The folder where the file is downloaded
'libpng-1.6.10', // The first dir where we have put our customisation
- 'libpng-1.6.10', // The folder for the merge
['**/*.c', '**/*.h', '**/*.S', '*.mk'], // Files to compile
'libpng-1.6.10' // Final destination dir
)
@@ -211,7 +209,6 @@ subprojects {
'giflib-5.1.1.tar.gz', // The downloaded file
'giflib', // The folder where the file is downloaded
'giflib-5.1.1/lib', // The first dir where we have put our customisation
- 'giflib', // The folder for the merge
['*.c', '*.h', '*.mk'], // Files to compile
'giflib' // Final destination dir
)
@@ -223,7 +220,6 @@ subprojects {
'v0.5.1.tar.gz', // The downloaded file
'libwebp', // The folder where the file is downloaded
'libwebp-0.5.1', // The first dir where we have put our customisation
- 'libwebp-0.5.1', // The folder for the merge
['src/**/*.c', 'src/**/*.h', '*.mk'], // Files to compile
'libwebp-0.5.1' // Final destination dir
)

0 comments on commit a3ab88c

Please sign in to comment.