From 8af6d110517bcb39a75d9d6cc6243a08ed9b89a0 Mon Sep 17 00:00:00 2001
From: Tim Su <tim@todoroo.com>
Date: Tue, 18 Jan 2011 14:46:24 -0800
Subject: [PATCH] Updated configuration for Astrid to use subtree projects for
 Android libraries

---
 api/default.properties    |  2 +-
 astrid/.classpath         |  1 +
 astrid/.project           |  5 +++++
 astrid/default.properties |  3 ++-
 samples/filters/.project  | 33 ---------------------------------
 5 files changed, 9 insertions(+), 35 deletions(-)
 delete mode 100644 samples/filters/.project

diff --git a/api/default.properties b/api/default.properties
index 2262a388e..d357fe214 100644
--- a/api/default.properties
+++ b/api/default.properties
@@ -9,4 +9,4 @@
 
 android.library=true
 # Project target.
-target=android-3
+target=android-4
diff --git a/astrid/.classpath b/astrid/.classpath
index 808d8c1b7..f3f2947e2 100644
--- a/astrid/.classpath
+++ b/astrid/.classpath
@@ -16,5 +16,6 @@
 	<classpathentry exported="true" kind="lib" path="libs/todoroo-g.jar"/>
 	<classpathentry kind="lib" path="libs/framework.jar"/>
 	<classpathentry kind="src" path="astridApi_src"/>
+	<classpathentry kind="src" path="GreenDroid_src"/>
 	<classpathentry kind="output" path="ecbuild"/>
 </classpath>
diff --git a/astrid/.project b/astrid/.project
index 4b34a7ef7..fa28c40a2 100644
--- a/astrid/.project
+++ b/astrid/.project
@@ -37,6 +37,11 @@
 		<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>
diff --git a/astrid/default.properties b/astrid/default.properties
index d47181a7f..d990da54f 100644
--- a/astrid/default.properties
+++ b/astrid/default.properties
@@ -9,7 +9,8 @@
 
 # Indicates whether an apk should be generated for each density.
 split.density=false
-android.library.reference.1=../../astridApi/
+android.library.reference.1=../api/
 # Project target.
 target=android-8
 apk-configurations=
+android.library.reference.2=../greendroid/GreenDroid/
diff --git a/samples/filters/.project b/samples/filters/.project
deleted file mode 100644
index 8496b7c6a..000000000
--- a/samples/filters/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>astrid-samples-filters</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>