From 682bc171fd14db0e4a05f01442241db09fe80e0b Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 10 Jun 2015 10:40:49 -0400 Subject: [PATCH] Change wpilibcZip to use "lib" instead of "libs" to match where eclipse plugins expect libraries Change-Id: I597c43d773507037cc7677fe4e1952a640543c81 --- wpilibc/build.gradle | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wpilibc/build.gradle b/wpilibc/build.gradle index ef289c403a..8859eea9bf 100644 --- a/wpilibc/build.gradle +++ b/wpilibc/build.gradle @@ -134,7 +134,7 @@ task wpilibcZip(type: Zip) { } } from(spec.staticLibraryFile) { - into 'libs' + into 'lib' } } @@ -147,7 +147,7 @@ task wpilibcZip(type: Zip) { } } from(spec.staticLibraryFile) { - into 'libs' + into 'lib' } } @@ -162,12 +162,12 @@ task wpilibcZip(type: Zip) { } } from(spec.staticLibraryFile) { - into 'libs' + into 'lib' } } hal.binaries.withType(SharedLibraryBinarySpec) { spec -> from(spec.sharedLibraryFile) { - into 'libs' + into 'lib' } } @@ -176,7 +176,7 @@ task wpilibcZip(type: Zip) { // Finally, include all of the shared library objects from the ni directory from(project.file('../ni-libraries')) { - into 'libs' + into 'lib' exclude 'genlinks' } }