updated build files

Author: codeanticode

build.xml

@@ -4,9 +4,6 @@
 
   <!-- path to the main processing repo --> 
   <property name="processing.dir" value="../processing" />
-
-  <!-- path to the android sdk -->
-  <property name="sdk.dir" value="/Users/andres/code/android/android-studio/sdk" />
 
   <property name="core.jar.path" value="processing-core.zip" />
   <property name="mode.jar.path" value="mode/AndroidMode.jar" />

core/build.xml

@@ -3,6 +3,9 @@
 <project default="build" name="Create .zip file for core">
   <property environment="env" />
 
+  <!-- path to the android sdk -->
+  <property name="sdk.dir" value="/Users/andres/code/android/sdk" />
+	
   <!-- path to the main processing repo --> 
   <property name="processing.dir" value="../../processing" />
 
@@ -18,21 +21,7 @@
   <!-- Support version to build the core library -->
   <property name="support.version" value="25.2.0" />	
 
-  <!-- oh ant, you're so cute and convoluted -->
-  <target name="build" depends="sdk_chatter,actual_build" />
-
-  <target name="sdk_chatter" unless="env.ANDROID_SDK">
-    <echo message="ANDROID_SDK not set, skipping build of processing-core.zip" />
-  </target>
-
-  <target name="sdk_whining">
-    <available file="${env.ANDROID_SDK}/platforms/${android.platform}/android.jar"
-	       property="andoid-jar-present" />
-    <fail unless="andoid-jar-present" 
-	  message="Android SDK could not be found in ${env.ANDROID_SDK}/platforms/${android.platform}/android.jar" />
-  </target>
-
-  <target name="actual_build" if="env.ANDROID_SDK">
+  <target name="build">
     <taskdef name="methods" 
 	     classname="PAppletMethods" 
 	     classpath="${processing.dir}/core/methods/methods.jar" />
@@ -43,7 +32,7 @@
 	   target="1.7" 
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
-	   bootclasspath="${env.ANDROID_SDK}/platforms/${android.platform}/android.jar;
+	   bootclasspath="${sdk.dir}/platforms/${android.platform}/android.jar;
     	              library/support-compat-${support.version}.jar;
     	              library/support-fragment-${support.version}.jar;
     	              library/support-annotations-${support.version}.jar;

gradle.properties

@@ -1,3 +1,3 @@
 // Set your Android SDK location and version here
-sdkdir=/Users/andres/code/android/android-studio/sdk
-sdkver=25
+sdkdir=/Users/andres/code/android/sdk
+sdkver=26

libraries/vr/build.xml

@@ -1,23 +1,26 @@
 <?xml version="1.0"?>
 <project name="Processing VR Library" default="build">
-
-  <property name="processing.dir" value="../../../processing" />
   <property environment="env"/>
+	
+  <!-- path to the android sdk -->
+  <property name="sdk.dir" value="/Users/andres/code/android/sdk" />
+
+  <!-- path to the main processing repo --> 
+  <property name="processing.dir" value="../../../processing" />	
+	
+  <!-- Android platform to build the core library -->
+  <property name="android.platform" value="android-26" />	
 
   <target name="clean" description="Clean the build directories">
     <delete dir="bin" />
     <delete file="library/vr.jar" />
   </target>
 
-  <target name="build" depends="sdk_chatter,compile" description="Build VR library for Processing Android" >
+  <target name="build" depends="compile" description="Build VR library for Processing Android" >
     <mkdir dir="library" />
     <jar basedir="bin" destfile="library/vr.jar" />
   </target>
 
-  <target name="sdk_chatter" unless="env.ANDROID_SDK">
-    <echo message="ANDROID_SDK not set, skipping build." />
-  </target>
-
   <target name="compile" description="Compile sources">
     <condition property="core-built">
       <available file="../../processing-core.zip" />
@@ -34,7 +37,7 @@
                   library/gvr-common.jar;
                   library/gvr-audio.jar;
 	              ../../processing-core.zip;
-	              ${env.ANDROID_SDK}/platforms/android-25/android.jar"
+    	          ${sdk.dir}/platforms/${android.platform}/android.jar"
 	   nowarn="true"
 	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
       <compilerclasspath path="../../../processing/java/mode/org.eclipse.jdt.core.jar;

processing-android

@@ -5,7 +5,10 @@
   <property name="processing.dir" value="../../../processing" />
 
   <!-- path to the android sdk -->
-  <property name="sdk.dir" value="/Users/andres/code/android/android-studio/sdk" />
+  <property name="sdk.dir" value="/Users/andres/code/android/sdk" />
+
+  <!-- Library version -->
+  <property name="lib.ver" value="25.3.2" />	
 
   <target name="clean" description="Clean the build directories">
     <delete dir="bin" />
@@ -21,8 +24,8 @@
 	   encoding="UTF-8"
 	   includeAntRuntime="false"
 	   classpath="${processing.dir}/app/bin;
-    	          ${sdk.dir}/tools/lib/sdklib-25.3.2.jar;
-    	          ${sdk.dir}/tools/lib/repository-25.3.2.jar" 
+    	          ${sdk.dir}/tools/lib/sdklib-${lib.ver}.jar;
+    	          ${sdk.dir}/tools/lib/repository-${lib.ver}.jar" 
 	   nowarn="true"
 	   compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
       <compilerclasspath path="${processing.dir}/java/mode/org.eclipse.jdt.core.jar;