Updated test apps for the SDK.

- added buildconfigtest
- removed libWithLibTest which is redundant with libsAndJarTest
- updated libsAndJarTest to have lib1 depend on lib2.
- Added COMPILE_AND_RUN for test apps that must be run.

Change-Id: If57a684826a04c0821932edd71e9970b0eb92f4b

58 files changed, 132 insertions, 354 deletions

diff --git a/testapps/buildConfigTest/COMPILE_AND_RUN b/testapps/buildConfigTest/COMPILE_AND_RUN
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testapps/buildConfigTest/COMPILE_AND_RUN
diff --git a/testapps/buildConfigTest/SUCCESS b/testapps/buildConfigTest/SUCCESS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testapps/buildConfigTest/SUCCESS
diff --git a/testapps/libWithLibTest/app/.classpath b/testapps/buildConfigTest/app/.classpath
index a4763d1..a4763d1 100644
--- a/testapps/libWithLibTest/app/.classpath
+++ b/testapps/buildConfigTest/app/.classpath
diff --git a/testapps/libWithLibTest/lib1/.project b/testapps/buildConfigTest/app/.project
index d256174..dd37abe 100644
--- a/testapps/libWithLibTest/lib1/.project
+++ b/testapps/buildConfigTest/app/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>libWithLibTest-lib1</name>
+	<name>buildConfigTest-app</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/testapps/libWithLibTest/lib1/AndroidManifest.xml b/testapps/buildConfigTest/app/AndroidManifest.xml
index aaf0fff..50e30b9 100644
--- a/testapps/libWithLibTest/lib1/AndroidManifest.xml
+++ b/testapps/buildConfigTest/app/AndroidManifest.xml
@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.android.tests.basiclib"
+      package="com.android.tests.buildconfigtest"
       android:versionCode="1"
       android:versionName="1.0">
-    <application android:icon="@drawable/icon" android:label="@string/basicLib_name">
+    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
         <activity android:name="Main"
-                  android:label="@string/basicLib_name">
+                  android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
     </application>
-    <uses-sdk android:minSdkVersion="15" />
 </manifest>
diff --git a/testapps/libWithLibTest/app/ant.properties b/testapps/buildConfigTest/app/ant.properties
index b0971e8..b0971e8 100644
--- a/testapps/libWithLibTest/app/ant.properties
+++ b/testapps/buildConfigTest/app/ant.properties
diff --git a/testapps/libWithLibTest/lib1/build.xml b/testapps/buildConfigTest/app/build.xml
index bc17734..09cd907 100644
--- a/testapps/libWithLibTest/lib1/build.xml
+++ b/testapps/buildConfigTest/app/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Main" default="help">
+<project name="buildConfigTest" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
diff --git a/testapps/buildConfigTest/app/lint.xml b/testapps/buildConfigTest/app/lint.xml
new file mode 100644
index 0000000..ee0eead
--- /dev/null
+++ b/testapps/buildConfigTest/app/lint.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<lint>
+</lint>
\ No newline at end of file
diff --git a/testapps/libWithLibTest/app/proguard-project.txt b/testapps/buildConfigTest/app/proguard-project.txt
index f2fe155..f2fe155 100644
--- a/testapps/libWithLibTest/app/proguard-project.txt
+++ b/testapps/buildConfigTest/app/proguard-project.txt
diff --git a/testapps/buildConfigTest/app/project.properties b/testapps/buildConfigTest/app/project.properties
new file mode 100644
index 0000000..c42f7ef
--- /dev/null
+++ b/testapps/buildConfigTest/app/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-15
+android.library.reference.1=../lib1
diff --git a/testapps/buildConfigTest/app/res/drawable-hdpi/ic_launcher.png b/testapps/buildConfigTest/app/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..8074c4c
--- /dev/null
+++ b/testapps/buildConfigTest/app/res/drawable-hdpi/ic_launcher.png
diff --git a/testapps/buildConfigTest/app/res/drawable-ldpi/ic_launcher.png b/testapps/buildConfigTest/app/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000..1095584
--- /dev/null
+++ b/testapps/buildConfigTest/app/res/drawable-ldpi/ic_launcher.png
diff --git a/testapps/libWithLibTest/lib1/res/drawable/icon.png b/testapps/buildConfigTest/app/res/drawable-mdpi/ic_launcher.png
index a07c69f..a07c69f 100644
--- a/testapps/libWithLibTest/lib1/res/drawable/icon.png
+++ b/testapps/buildConfigTest/app/res/drawable-mdpi/ic_launcher.png
diff --git a/testapps/buildConfigTest/app/res/layout/main.xml b/testapps/buildConfigTest/app/res/layout/main.xml
new file mode 100644
index 0000000..6a3de67
--- /dev/null
+++ b/testapps/buildConfigTest/app/res/layout/main.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/app"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="App: Release"
+        tools:ignore="HardcodedText" />
+
+    <TextView
+        android:id="@+id/lib1"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="\\?"
+        tools:ignore="HardcodedText" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/testapps/libWithLibTest/lib1/res/values/strings.xml b/testapps/buildConfigTest/app/res/values/strings.xml
index 1bdf988..004b9f0 100644
--- a/testapps/libWithLibTest/lib1/res/values/strings.xml
+++ b/testapps/buildConfigTest/app/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="basicLib_name">basicLib</string>
+    <string name="app_name">BuildConfigTest</string>
 </resources>
diff --git a/testapps/buildConfigTest/app/src/com/android/tests/buildconfigtest/Main.java b/testapps/buildConfigTest/app/src/com/android/tests/buildconfigtest/Main.java
new file mode 100644
index 0000000..6421c60
--- /dev/null
+++ b/testapps/buildConfigTest/app/src/com/android/tests/buildconfigtest/Main.java
@@ -0,0 +1,26 @@
+package com.android.tests.buildconfigtest;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+import com.android.tests.buildconfigtest.lib1.Lib1;
+
+public class Main extends Activity
+{
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.main);
+
+        if (BuildConfig.DEBUG) {
+            TextView tv = (TextView) findViewById(R.id.app);
+            tv.setText("App: DEBUG");
+        }
+
+        TextView tv = (TextView) findViewById(R.id.lib1);
+        tv.setText("Lib: " + Lib1.getContent());
+    }
+}
diff --git a/testapps/libWithLibTest/lib1/.classpath b/testapps/buildConfigTest/lib1/.classpath
index a4763d1..a4763d1 100644
--- a/testapps/libWithLibTest/lib1/.classpath
+++ b/testapps/buildConfigTest/lib1/.classpath
diff --git a/testapps/libWithLibTest/lib2/.project b/testapps/buildConfigTest/lib1/.project
index 5f68270..22c9a5b 100644
--- a/testapps/libWithLibTest/lib2/.project
+++ b/testapps/buildConfigTest/lib1/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>libWithLibTest-lib2</name>
+	<name>buildConfigTest-Lib</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/testapps/buildConfigTest/lib1/AndroidManifest.xml b/testapps/buildConfigTest/lib1/AndroidManifest.xml
new file mode 100644
index 0000000..58aa624
--- /dev/null
+++ b/testapps/buildConfigTest/lib1/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.tests.javaprojecttest.lib1"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <application
+        android:icon="@drawable/ic_launcher"
+        android:label="@string/app_name" >
+        <activity
+            android:name="com.android.tests.buildconfigtest.lib1.Main"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/testapps/libWithLibTest/app/build.xml b/testapps/buildConfigTest/lib1/build.xml
index bc17734..2a15ae6 100644
--- a/testapps/libWithLibTest/app/build.xml
+++ b/testapps/buildConfigTest/lib1/build.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project name="Main" default="help">
+<project name="lib1" default="help">
 
     <!-- The local.properties file is created and updated by the 'android' tool.
          It contains the path to the SDK. It should *NOT* be checked into
diff --git a/testapps/libWithLibTest/lib1/proguard-project.txt b/testapps/buildConfigTest/lib1/proguard-project.txt
index f2fe155..f2fe155 100644
--- a/testapps/libWithLibTest/lib1/proguard-project.txt
+++ b/testapps/buildConfigTest/lib1/proguard-project.txt
diff --git a/testapps/buildConfigTest/lib1/project.properties b/testapps/buildConfigTest/lib1/project.properties
new file mode 100644
index 0000000..36f1594
--- /dev/null
+++ b/testapps/buildConfigTest/lib1/project.properties
@@ -0,0 +1,15 @@
+# This file is automatically generated by Android Tools.
+# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
+#
+# This file must be checked in Version Control Systems.
+#
+# To customize properties used by the Ant build system edit
+# "ant.properties", and override values to adapt the script to your
+# project structure.
+#
+# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
+#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
+
+# Project target.
+target=android-15
+android.library=true
diff --git a/testapps/buildConfigTest/lib1/res/drawable-hdpi/ic_launcher.png b/testapps/buildConfigTest/lib1/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..8074c4c
--- /dev/null
+++ b/testapps/buildConfigTest/lib1/res/drawable-hdpi/ic_launcher.png
diff --git a/testapps/buildConfigTest/lib1/res/drawable-ldpi/ic_launcher.png b/testapps/buildConfigTest/lib1/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000..1095584
--- /dev/null
+++ b/testapps/buildConfigTest/lib1/res/drawable-ldpi/ic_launcher.png
diff --git a/testapps/libWithLibTest/lib2/res/drawable/icon.png b/testapps/buildConfigTest/lib1/res/drawable-mdpi/ic_launcher.png
index a07c69f..a07c69f 100644
--- a/testapps/libWithLibTest/lib2/res/drawable/icon.png
+++ b/testapps/buildConfigTest/lib1/res/drawable-mdpi/ic_launcher.png
diff --git a/testapps/libWithLibTest/lib2/res/values/ids.xml b/testapps/buildConfigTest/lib1/res/values/strings.xml
index 8cbe2cc..549e4ea 100644
--- a/testapps/libWithLibTest/lib2/res/values/ids.xml
+++ b/testapps/buildConfigTest/lib1/res/values/strings.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <item name="text" type="id"/>
+    <string name="app_name">Main</string>
 </resources>
diff --git a/testapps/buildConfigTest/lib1/src/com/android/tests/buildconfigtest/lib1/Lib1.java b/testapps/buildConfigTest/lib1/src/com/android/tests/buildconfigtest/lib1/Lib1.java
new file mode 100644
index 0000000..cca0eff
--- /dev/null
+++ b/testapps/buildConfigTest/lib1/src/com/android/tests/buildconfigtest/lib1/Lib1.java
@@ -0,0 +1,17 @@
+package com.android.tests.buildconfigtest.lib1;
+
+import com.android.tests.javaprojecttest.lib1.BuildConfig;
+
+
+public class Lib1 {
+
+    public static String getContent() {
+        String a = "Release";
+        
+        if (BuildConfig.DEBUG) {
+            a = "DEBUG";
+        }
+        
+        return a;
+    }
+}
diff --git a/testapps/gridlayoutTest/COMPILE_AND_RUN b/testapps/gridlayoutTest/COMPILE_AND_RUN
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testapps/gridlayoutTest/COMPILE_AND_RUN
diff --git a/testapps/gridlayoutTest/SUCCESS b/testapps/gridlayoutTest/SUCCESS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testapps/gridlayoutTest/SUCCESS
diff --git a/testapps/javaProjectTest/COMPILE_AND_RUN b/testapps/javaProjectTest/COMPILE_AND_RUN
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testapps/javaProjectTest/COMPILE_AND_RUN
diff --git a/testapps/libWithLibTest/.DS_Store b/testapps/libWithLibTest/.DS_Store
deleted file mode 100644
index 8d9d631..0000000
--- a/testapps/libWithLibTest/.DS_Store
+++ /dev/null
diff --git a/testapps/libWithLibTest/app/.project b/testapps/libWithLibTest/app/.project
deleted file mode 100644
index 39feaec..0000000
--- a/testapps/libWithLibTest/app/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>libWithLibTest-app</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>
diff --git a/testapps/libWithLibTest/app/AndroidManifest.xml b/testapps/libWithLibTest/app/AndroidManifest.xml
deleted file mode 100644
index 4870542..0000000
--- a/testapps/libWithLibTest/app/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.android.tests.basicprojectwithlib"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <application android:icon="@drawable/icon" android:label="@string/full_app_name">
-        <activity android:name="com.android.tests.basiclib.Main" android:label="@string/basicLib_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name="com.android.tests.basiclibwithjar.Main" android:label="@string/basicLibWithJar_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    <uses-sdk android:minSdkVersion="15" />
-</manifest>
diff --git a/testapps/libWithLibTest/app/project.properties b/testapps/libWithLibTest/app/project.properties
deleted file mode 100644
index 6133d73..0000000
--- a/testapps/libWithLibTest/app/project.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# 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
-# project structure.
-
-# Project target.
-target=android-15
-android.library.reference.1=../lib1
diff --git a/testapps/libWithLibTest/app/res/values/strings.xml b/testapps/libWithLibTest/app/res/values/strings.xml
deleted file mode 100644
index bdca683..0000000
--- a/testapps/libWithLibTest/app/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="full_app_name">basicProjectWithLib</string>
-</resources>
diff --git a/testapps/libWithLibTest/lib1/ant.properties b/testapps/libWithLibTest/lib1/ant.properties
deleted file mode 100644
index b0971e8..0000000
--- a/testapps/libWithLibTest/lib1/ant.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked into Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
diff --git a/testapps/libWithLibTest/lib1/project.properties b/testapps/libWithLibTest/lib1/project.properties
deleted file mode 100644
index 6bb4bd0..0000000
--- a/testapps/libWithLibTest/lib1/project.properties
+++ /dev/null
@@ -1,13 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# 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
-# project structure.
-
-# Project target.
-target=android-15
-android.library=true
-android.library.reference.1=../lib2
diff --git a/testapps/libWithLibTest/lib1/res/layout/basiclib_main.xml b/testapps/libWithLibTest/lib1/res/layout/basiclib_main.xml
deleted file mode 100644
index 37e5c2c..0000000
--- a/testapps/libWithLibTest/lib1/res/layout/basiclib_main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<TextView
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:text="basicLib Layout"
-    />
-</LinearLayout>
-
diff --git a/testapps/libWithLibTest/lib1/src/com/android/tests/basiclib/Main.java b/testapps/libWithLibTest/lib1/src/com/android/tests/basiclib/Main.java
deleted file mode 100644
index 0be5f11..0000000
--- a/testapps/libWithLibTest/lib1/src/com/android/tests/basiclib/Main.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.android.tests.basiclib;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-public class Main extends Activity
-{
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.basiclib_main);
-    }
-}
diff --git a/testapps/libWithLibTest/lib2/.classpath b/testapps/libWithLibTest/lib2/.classpath
deleted file mode 100644
index a4763d1..0000000
--- a/testapps/libWithLibTest/lib2/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/testapps/libWithLibTest/lib2/AndroidManifest.xml b/testapps/libWithLibTest/lib2/AndroidManifest.xml
deleted file mode 100644
index 1363206..0000000
--- a/testapps/libWithLibTest/lib2/AndroidManifest.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="com.android.tests.basiclibwithjar"
-      android:versionCode="1"
-      android:versionName="1.0">
-    <application android:icon="@drawable/icon" android:label="@string/basicLibWithJar_name">
-        <activity android:name="Main" android:label="@string/basicLibWithJar_name">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-    </application>
-    <uses-sdk android:minSdkVersion="15" />
-</manifest>
diff --git a/testapps/libWithLibTest/lib2/ant.properties b/testapps/libWithLibTest/lib2/ant.properties
deleted file mode 100644
index b0971e8..0000000
--- a/testapps/libWithLibTest/lib2/ant.properties
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked into Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
diff --git a/testapps/libWithLibTest/lib2/build.xml b/testapps/libWithLibTest/lib2/build.xml
deleted file mode 100644
index bc17734..0000000
--- a/testapps/libWithLibTest/lib2/build.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="Main" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: 1 -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-</project>
diff --git a/testapps/libWithLibTest/lib2/libs/basicJar.jar b/testapps/libWithLibTest/lib2/libs/basicJar.jar
deleted file mode 100644
index 319ed02..0000000
--- a/testapps/libWithLibTest/lib2/libs/basicJar.jar
+++ /dev/null
diff --git a/testapps/libWithLibTest/lib2/proguard-project.txt b/testapps/libWithLibTest/lib2/proguard-project.txt
deleted file mode 100644
index f2fe155..0000000
--- a/testapps/libWithLibTest/lib2/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/testapps/libWithLibTest/lib2/project.properties b/testapps/libWithLibTest/lib2/project.properties
deleted file mode 100644
index 7414a68..0000000
--- a/testapps/libWithLibTest/lib2/project.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# 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
-# project structure.
-
-# Project target.
-target=android-15
-android.library=true
diff --git a/testapps/libWithLibTest/lib2/res/layout/basiclibwithjar_main.xml b/testapps/libWithLibTest/lib2/res/layout/basiclibwithjar_main.xml
deleted file mode 100644
index 5fefdd7..0000000
--- a/testapps/libWithLibTest/lib2/res/layout/basiclibwithjar_main.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<TextView
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:text="basicLibWithJar"
-    android:id="@+id/text"
-    />
-</LinearLayout>
-
diff --git a/testapps/libWithLibTest/lib2/res/layout/main.xml b/testapps/libWithLibTest/lib2/res/layout/main.xml
deleted file mode 100644
index fc39355..0000000
--- a/testapps/libWithLibTest/lib2/res/layout/main.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-<TextView
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:text="basicLibWithJar"
-    android:id="@id/text"
-    />
-</LinearLayout>
-
diff --git a/testapps/libWithLibTest/lib2/res/values/strings.xml b/testapps/libWithLibTest/lib2/res/values/strings.xml
deleted file mode 100644
index 1701887..0000000
--- a/testapps/libWithLibTest/lib2/res/values/strings.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="basicLibWithJar_name">basicLibWithJar</string>
-</resources>
diff --git a/testapps/libWithLibTest/lib2/src/com/android/tests/basiclibwithjar/Main.java b/testapps/libWithLibTest/lib2/src/com/android/tests/basiclibwithjar/Main.java
deleted file mode 100644
index a7b782a..0000000
--- a/testapps/libWithLibTest/lib2/src/com/android/tests/basiclibwithjar/Main.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.android.tests.basiclibwithjar;
-
-import com.android.tests.basicjar.Foo;
-
-import android.app.Activity;
-import android.os.Bundle;
-import android.widget.TextView;
-
-public class Main extends Activity
-{
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState)
-    {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.basiclibwithjar_main);
-
-        Foo foo = new Foo();
-        int a = foo.getRandomFoo();
-
-        TextView tv = (TextView) findViewById(R.id.text);
-        tv.setText("BasicLibWithJar: Value from Jar: " + a);
-
-    }
-}
diff --git a/testapps/libsAndJarTest/COMPILE_AND_RUN b/testapps/libsAndJarTest/COMPILE_AND_RUN
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testapps/libsAndJarTest/COMPILE_AND_RUN
diff --git a/testapps/libsAndJarTest/app/.project b/testapps/libsAndJarTest/app/.project
index 187fb0e..dc5f570 100644
--- a/testapps/libsAndJarTest/app/.project
+++ b/testapps/libsAndJarTest/app/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>javaProjectTest-app</name>
+	<name>libsAndJarTest-app</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/testapps/libsAndJarTest/app/project.properties b/testapps/libsAndJarTest/app/project.properties
index 9384511..4fe0502 100644
--- a/testapps/libsAndJarTest/app/project.properties
+++ b/testapps/libsAndJarTest/app/project.properties
@@ -13,4 +13,3 @@ proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.
 # Project target.
 target=android-15
 android.library.reference.1=../lib1
-android.library.reference.2=../lib2
diff --git a/testapps/libsAndJarTest/lib1/.project b/testapps/libsAndJarTest/lib1/.project
index cac8ac1..616ff1f 100644
--- a/testapps/libsAndJarTest/lib1/.project
+++ b/testapps/libsAndJarTest/lib1/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>javaProjectTest-Lib1</name>
+	<name>libsAndJarTest-Lib1</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/testapps/libsAndJarTest/lib1/project.properties b/testapps/libsAndJarTest/lib1/project.properties
index 36f1594..480c5b6 100644
--- a/testapps/libsAndJarTest/lib1/project.properties
+++ b/testapps/libsAndJarTest/lib1/project.properties
@@ -13,3 +13,4 @@
 # Project target.
 target=android-15
 android.library=true
+android.library.reference.1=../lib2
diff --git a/testapps/libsAndJarTest/lib2/.project b/testapps/libsAndJarTest/lib2/.project
index 63d7a48..3f2ef16 100644
--- a/testapps/libsAndJarTest/lib2/.project
+++ b/testapps/libsAndJarTest/lib2/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>javaProjectTest-Lib2</name>
+	<name>libsAndJarTest-Lib2</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/testapps/testProjectTest/COMPILE_AND_RUN b/testapps/testProjectTest/COMPILE_AND_RUN
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testapps/testProjectTest/COMPILE_AND_RUN
diff --git a/testapps/userLibTest/COMPILE_AND_RUN b/testapps/userLibTest/COMPILE_AND_RUN
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/testapps/userLibTest/COMPILE_AND_RUN