From 9a5794ef6975460eca6f3591622e3d9ed0a3db1f Mon Sep 17 00:00:00 2001
From: Arne Jans <arne.jans@gmail.com>
Date: Wed, 23 Nov 2011 00:39:42 +0100
Subject: [PATCH 1/3] Fixed project setup. Removed old linked folders to the
 library-projects. Sorry about the renaming from ecbuild to bin/classes but my
 Eclipse is stubborn about it. When I revert or explicitly specify ecbuild,
 build is broken and I have to start over fixing it again. Please advise if
 bin/classes breaks things for you.

---
 api/.classpath                   |  2 +-
 astrid/.classpath                |  5 +----
 astrid/.project                  | 17 -----------------
 facebook/facebook/.classpath     |  2 +-
 greendroid/GreenDroid/.classpath |  2 +-
 5 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/api/.classpath b/api/.classpath
index 52ae72c83..6c635c01d 100644
--- a/api/.classpath
+++ b/api/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="ecbuild"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/astrid/.classpath b/astrid/.classpath
index 862680f17..8b1831765 100644
--- a/astrid/.classpath
+++ b/astrid/.classpath
@@ -26,10 +26,7 @@
 	<classpathentry kind="lib" path="libs/google-oauth-client-1.5.0-beta.jar"/>
 	<classpathentry kind="lib" path="libs/google-oauth-client-extensions-1.5.0-beta.jar"/>
 	<classpathentry kind="lib" path="libs/gson-1.6.jar"/>
-	<classpathentry kind="src" path="GreenDroid_src"/>
-	<classpathentry kind="src" path="astridApi_src"/>
-	<classpathentry kind="src" path="facebook_src"/>
 	<classpathentry exported="true" kind="lib" path="libs/google-api-services-tasks-v1-1.2.5-beta.jar"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="output" path="ecbuild"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/astrid/.project b/astrid/.project
index 7955497d1..a8cc9332f 100644
--- a/astrid/.project
+++ b/astrid/.project
@@ -36,21 +36,4 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.wst.common.project.facet.core.nature</nature>
 	</natures>
-	<linkedResources>
-		<link>
-			<name>GreenDroid_src</name>
-			<type>2</type>
-			<locationURI>_android_GreenDroid_612cb559/src</locationURI>
-		</link>
-		<link>
-			<name>astridApi_src</name>
-			<type>2</type>
-			<locationURI>_android_astridApi_98e6a2cf/src</locationURI>
-		</link>
-		<link>
-			<name>facebook_src</name>
-			<type>2</type>
-			<locationURI>_android_facebook_1da19ac6/src</locationURI>
-		</link>
-	</linkedResources>
 </projectDescription>
diff --git a/facebook/facebook/.classpath b/facebook/facebook/.classpath
index 52ae72c83..6c635c01d 100644
--- a/facebook/facebook/.classpath
+++ b/facebook/facebook/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="ecbuild"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/greendroid/GreenDroid/.classpath b/greendroid/GreenDroid/.classpath
index 52ae72c83..6c635c01d 100644
--- a/greendroid/GreenDroid/.classpath
+++ b/greendroid/GreenDroid/.classpath
@@ -3,5 +3,5 @@
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="output" path="ecbuild"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

From 96829331624e4772c2f859c0d6f2cb57d293c202 Mon Sep 17 00:00:00 2001
From: Arne Jans <arne.jans@gmail.com>
Date: Thu, 24 Nov 2011 10:06:05 +0100
Subject: [PATCH 2/3] Also changed output folder for tests to bin/classes. This
 output folder is hard-coded by ADT r14 for Java-classes.

---
 tests/.classpath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/.classpath b/tests/.classpath
index 1f0940313..eaa1b5149 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -4,5 +4,5 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/astrid"/>
-	<classpathentry kind="output" path="ecbuild"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

From 21606f4f653dc028f96957571d6d8d993f936156 Mon Sep 17 00:00:00 2001
From: Arne Jans <arne.jans@gmail.com>
Date: Thu, 24 Nov 2011 10:08:59 +0100
Subject: [PATCH 3/3] Fixed tests-project not having the api-project as a
 reference.

---
 tests/.classpath         | 1 +
 tests/project.properties | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/.classpath b/tests/.classpath
index eaa1b5149..235ca48e1 100644
--- a/tests/.classpath
+++ b/tests/.classpath
@@ -4,5 +4,6 @@
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/astrid"/>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/tests/project.properties b/tests/project.properties
index c1fd41ab1..6420eb762 100644
--- a/tests/project.properties
+++ b/tests/project.properties
@@ -11,3 +11,4 @@
 split.density=false
 # Project target.
 target=android-8
+android.library.reference.1=../api