move cardboard packages to gvrsdk folder

Author: codeanticode

libraries/cardboard/build.xml

@@ -44,20 +44,25 @@
   <target name="dist" depends="build" description="Creates distribution package">
     <mkdir dir="dist/tmp/cardboard" />
 
-   	<!-- copy library files (jar and gstreamer natives) -->
+   	<!-- copy library files (jar and natives) -->
   	<copy todir="dist/tmp/cardboard/library">
   		<fileset dir="library" />
-	</copy>
+	  </copy>
 
   	<!-- copy examples -->
   	<copy todir="dist/tmp/cardboard/examples">
   		<fileset dir="examples" />
-	</copy>
+	  </copy>
 
   	<!-- copy source -->
     <copy todir="dist/tmp/cardboard/src">
   		<fileset dir="src" />
-	</copy>	
+	  </copy>	
+
+  	<!-- copy GVR SDK (needed by the mode to build the carboard app) -->
+    <copy todir="dist/tmp/cardboard/gvrsdk">
+  		<fileset dir="gvrsdk" />
+	  </copy>	
 
     <!-- copy properties -->
     <copy file="library.properties" tofile="dist/tmp/cardboard/library.properties" />

libraries/cardboard/library/cardboard_audio.zip renamed to libraries/cardboard/gvrsdk/cardboard_audio.zip

@@ -353,9 +353,9 @@ public File createProject(boolean wear) throws IOException, SketchException {
         ////////////////////////////////////////////////////////////////////////
         // first step: unpack the cardboard packages in the project's 
         // libs folder:        
-        File audioZipFile = mode.getContentFile("libraries/cardboard/library/cardboard_audio.zip");
-        File commonZipFile = mode.getContentFile("libraries/cardboard/library/cardboard_common.zip");
-        File coreZipFile = mode.getContentFile("libraries/cardboard/library/cardboard_core.zip");
+        File audioZipFile = mode.getContentFile("libraries/cardboard/gvrsdk/cardboard_audio.zip");
+        File commonZipFile = mode.getContentFile("libraries/cardboard/gvrsdk/cardboard_common.zip");
+        File coreZipFile = mode.getContentFile("libraries/cardboard/gvrsdk/cardboard_core.zip");
         AndroidMode.extractFolder(audioZipFile, libsFolder, true);        
         AndroidMode.extractFolder(commonZipFile, libsFolder, true);        
         AndroidMode.extractFolder(coreZipFile, libsFolder, true);