Updating project to build with latest version of the ADT plugin and Android SDK.

The new version seems a bit quirky, if it has build problems try initially building one project at a time in the right order.

MyTracks/.classpath

@@ -16,6 +16,7 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
-	<classpathentry kind="src" path="MyTracksLib_src"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/MyTracksLib"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

MyTracks/.project

@@ -31,11 +31,4 @@
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
-	<linkedResources>
-		<link>
-			<name>MyTracksLib_src</name>
-			<type>2</type>
-			<locationURI>_android_MyTracksLib_e2802071/src</locationURI>
-		</link>
-	</linkedResources>
 </projectDescription>

MyTracks/project.properties

@@ -4,14 +4,12 @@
 # This file must be checked in Version Control Systems.
 #
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
 # Indicates whether an apk should be generated for each density.
 split.density=false
+android.library.reference.1=../MyTracksLib/
+proguard.config=proguard.cfg
 # Project target.
 target=Google Inc.:Google APIs:13
-android.library.reference.1=../MyTracksLib/
-
-# Enable proguard.
-proguard.config=proguard.cfg

MyTracksApiSample/.classpath

@@ -4,6 +4,7 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
-	<classpathentry kind="src" path="MyTracksLib_src"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/MyTracksLib"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

MyTracksApiSample/.project

@@ -30,11 +30,4 @@
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
-	<linkedResources>
-		<link>
-			<name>MyTracksLib_src</name>
-			<type>2</type>
-			<locationURI>_android_MyTracksLib_e2802071/src</locationURI>
-		</link>
-	</linkedResources>
 </projectDescription>

MyTracksApiSample/.settings/org.eclipse.jdt.core.prefs

@@ -1,5 +1,15 @@
-#Thu Oct 13 15:26:00 PDT 2011
+#Thu Oct 20 20:36:29 BRST 2011
 eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.6
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.6
 org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
 org.eclipse.jdt.core.formatter.alignment_for_annotations_on_local_variable=569
 org.eclipse.jdt.core.formatter.alignment_for_annotations_on_member=569

MyTracksApiSample/project.properties

@@ -4,9 +4,9 @@
 # This file must be checked in Version Control Systems.
 #
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
+android.library.reference.1=../MyTracksLib
 # Project target.
 target=Google Inc.:Google APIs:10
-android.library.reference.1=../MyTracksLib

MyTracksLib/.classpath

@@ -4,5 +4,6 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry exported="true" kind="lib" path="libs/protobuf-java-2.3.0-lite.jar"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

MyTracksLib/project.properties

@@ -4,9 +4,9 @@
 # This file must be checked in Version Control Systems.
 #
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
+android.library=true
 # Project target.
 target=android-13
-android.library=true

MyTracksTest/.classpath

@@ -11,5 +11,7 @@
 	</classpathentry>
 	<classpathentry combineaccessrules="false" kind="src" path="/MyTracks"/>
 	<classpathentry kind="lib" path="/MyTracks/libs/google-common.jar"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/MyTracksLib"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

MyTracksTest/project.properties

@@ -4,10 +4,11 @@
 # This file must be checked in Version Control Systems.
 #
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
 # Indicates whether an apk should be generated for each density.
 split.density=false
 # Project target.
 target=Google Inc.:Google APIs:13
+android.library.reference.1=../MyTracksLib

SignalStrengthSampler/.classpath

@@ -4,6 +4,7 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="lib" path="/MyTracksLib/libs/protobuf-java-2.3.0-lite.jar"/>
-	<classpathentry kind="src" path="MyTracksLib_src"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/MyTracksLib"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

SignalStrengthSampler/.project

@@ -30,11 +30,4 @@
 		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
 		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
-	<linkedResources>
-		<link>
-			<name>MyTracksLib_src</name>
-			<type>2</type>
-			<locationURI>_android_MyTracksLib_e2802071/src</locationURI>
-		</link>
-	</linkedResources>
 </projectDescription>

SignalStrengthSampler/project.properties

@@ -4,10 +4,10 @@
 # This file must be checked in Version Control Systems.
 #
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
+android.library.reference.1=../MyTracksLib/
+proguard.config=proguard.cfg
 # Project target.
 target=android-10
-proguard.config=proguard.cfg
-android.library.reference.1=../MyTracksLib/

SignalStrengthSamplerTest/.classpath

@@ -5,5 +5,7 @@
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry kind="lib" path="libs/AndroidMockRuntime.jar"/>
 	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/MyTracksLib"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

SignalStrengthSamplerTest/project.properties

@@ -4,8 +4,9 @@
 # This file must be checked in Version Control Systems.
 #
 # To customize properties used by the Ant build system use,
-# "build.properties", and override values to adapt the script to your
+# "ant.properties", and override values to adapt the script to your
 # project structure.
 
 # Project target.
 target=android-10
+android.library.reference.1=../MyTracksLib