From 7b6e8d8b4736521a6c7106f718428d26640ebae5 Mon Sep 17 00:00:00 2001 From: Peter Collins Date: Tue, 18 Jul 2017 16:42:35 -0400 Subject: [PATCH] [tests/Codegen-Binding] Use a variable for the 'gradlew' invocation in BuildJavaLibs This fixes a 'gradlew' failure which is encountered on Windows only. Unfortunately, the 'gradlew' invocation prefixes the 'sdk.dir' value read from 'local.properties' with the path of the working directory. As a result, we encounter a failure along the following lines on Windows: ``` * What went wrong: A problem occurred configuring project ':library'. > The SDK directory 'C:\Users\xamarinqa\git\xamarin-android\tests\CodeGen-Binding\Xamarin.Android.LibraryProjectZip-LibBinding\java\JavaLib\C:Program Files (x86)Androidandroid-sdk' does not exist ``` This can be avoided by exporting ANDROID_HOME in the Exec portion of the BuildJavaLibs target, rather than writing this information to a file and expecting 'gradlew' to process it correctly. --- .../Xamarin.Android.LibraryProjectZip-LibBinding.targets | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.targets b/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.targets index dc5de1ff367..318b431ebd3 100644 --- a/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.targets +++ b/tests/CodeGen-Binding/Xamarin.Android.LibraryProjectZip-LibBinding/Xamarin.Android.LibraryProjectZip-LibBinding.targets @@ -42,12 +42,8 @@ DependsOnTargets="AndroidPrepareForBuild" Inputs="java\JavaLib\project.properties" Outputs="$(OutputPath)JavaLib.zip"> -