Move Android project with Java project dep test to its own folder.

Also make it more complex:
- java project references a jar file.
- 2 libs depend on the java project
- app project only reference the libs, not the java project
  (it still does but indirectly).

Change-Id: I8fc53e0f868ce014ea99486e7b1fa6fe0f197daa

44 files changed, 484 insertions, 22 deletions

diff --git a/testapps/basicProjectWithJava/default.properties b/testapps/basicProjectWithJava/default.properties
deleted file mode 100644
index 8ee25b8..0000000
--- a/testapps/basicProjectWithJava/default.properties
+++ /dev/null
@@ -1,11 +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-AOSP
diff --git a/testapps/basicProjectWithJava/.classpath b/testapps/javaProjectTest/app/.classpath
index 61fad04..a4763d1 100644
--- a/testapps/basicProjectWithJava/.classpath
+++ b/testapps/javaProjectTest/app/.classpath
@@ -4,6 +4,5 @@
 	<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 combineaccessrules="false" kind="src" path="/basicJavaProject"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="output" path="bin/classes"/>
 </classpath>
diff --git a/testapps/basicProjectWithJava/.project b/testapps/javaProjectTest/app/.project
index 5ff4505..69b06f5 100644
--- a/testapps/basicProjectWithJava/.project
+++ b/testapps/javaProjectTest/app/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>basicProjectWithJava</name>
+	<name>app</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/testapps/javaProjectTest/app/AndroidManifest.xml b/testapps/javaProjectTest/app/AndroidManifest.xml
new file mode 100644
index 0000000..0ccbb84
--- /dev/null
+++ b/testapps/javaProjectTest/app/AndroidManifest.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.tests.basicProjectWithJava"
+    android:versionCode="1"
+    android:versionName="1.0" >
+
+    <uses-sdk android:minSdkVersion="15" />
+
+    <application
+        android:icon="@drawable/icon"
+        android:label="@string/app_name" >
+        <activity
+            android:name="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/javaProjectTest/app/project.properties b/testapps/javaProjectTest/app/project.properties
new file mode 100644
index 0000000..52891d4
--- /dev/null
+++ b/testapps/javaProjectTest/app/project.properties
@@ -0,0 +1,16 @@
+# 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
+android.library.reference.2=../lib2
diff --git a/testapps/basicProjectWithJava/res/drawable-hdpi/icon.png b/testapps/javaProjectTest/app/res/drawable-hdpi/icon.png
index 8074c4c..8074c4c 100644
--- a/testapps/basicProjectWithJava/res/drawable-hdpi/icon.png
+++ b/testapps/javaProjectTest/app/res/drawable-hdpi/icon.png
diff --git a/testapps/basicProjectWithJava/res/drawable-ldpi/icon.png b/testapps/javaProjectTest/app/res/drawable-ldpi/icon.png
index 1095584..1095584 100644
--- a/testapps/basicProjectWithJava/res/drawable-ldpi/icon.png
+++ b/testapps/javaProjectTest/app/res/drawable-ldpi/icon.png
diff --git a/testapps/basicProjectWithJava/res/drawable-mdpi/icon.png b/testapps/javaProjectTest/app/res/drawable-mdpi/icon.png
index a07c69f..a07c69f 100644
--- a/testapps/basicProjectWithJava/res/drawable-mdpi/icon.png
+++ b/testapps/javaProjectTest/app/res/drawable-mdpi/icon.png
diff --git a/testapps/basicProjectWithJava/res/layout/main.xml b/testapps/javaProjectTest/app/res/layout/main.xml
index 670dd32..670dd32 100644
--- a/testapps/basicProjectWithJava/res/layout/main.xml
+++ b/testapps/javaProjectTest/app/res/layout/main.xml
diff --git a/testapps/basicProjectWithJava/res/values/strings.xml b/testapps/javaProjectTest/app/res/values/strings.xml
index 96d8724..96d8724 100644
--- a/testapps/basicProjectWithJava/res/values/strings.xml
+++ b/testapps/javaProjectTest/app/res/values/strings.xml
diff --git a/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/Main.java b/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/Main.java
index eb6be25..eb6be25 100644
--- a/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/Main.java
+++ b/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/Main.java
diff --git a/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/MyTextView.java b/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/MyTextView.java
index ae35dca..ae35dca 100644
--- a/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/MyTextView.java
+++ b/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/MyTextView.java
diff --git a/testapps/basicJavaProject/.classpath b/testapps/javaProjectTest/javaProject/.classpath
index 8727917..139d9a3 100644
--- a/testapps/basicJavaProject/.classpath
+++ b/testapps/javaProjectTest/javaProject/.classpath
@@ -2,5 +2,6 @@
 <classpath>
 	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
+	<classpathentry kind="lib" path="libs/basicJar.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/testapps/basicJavaProject/.project b/testapps/javaProjectTest/javaProject/.project
index 89442a6..225e486 100644
--- a/testapps/basicJavaProject/.project
+++ b/testapps/javaProjectTest/javaProject/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>basicJavaProject</name>
+	<name>javaProject</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/testapps/javaProjectTest/javaProject/libs/basicJar.jar b/testapps/javaProjectTest/javaProject/libs/basicJar.jar
new file mode 100644
index 0000000..8169064
--- /dev/null
+++ b/testapps/javaProjectTest/javaProject/libs/basicJar.jar
diff --git a/testapps/basicJavaProject/src/com/android/tests/basicJavaProject/Foo.java b/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java
index 4a7d31c..4a7d31c 100644
--- a/testapps/basicJavaProject/src/com/android/tests/basicJavaProject/Foo.java
+++ b/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java
diff --git a/testapps/javaProjectTest/lib1/.classpath b/testapps/javaProjectTest/lib1/.classpath
new file mode 100644
index 0000000..71cf1b1
--- /dev/null
+++ b/testapps/javaProjectTest/lib1/.classpath
@@ -0,0 +1,10 @@
+<?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 combineaccessrules="false" kind="src" path="/javaProject"/>
+	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/testapps/javaProjectTest/lib1/.project b/testapps/javaProjectTest/lib1/.project
new file mode 100644
index 0000000..596b85d
--- /dev/null
+++ b/testapps/javaProjectTest/lib1/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Lib1</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/basicProjectWithJava/AndroidManifest.xml b/testapps/javaProjectTest/lib1/AndroidManifest.xml
index bf7a084..196db0b 100644
--- a/testapps/basicProjectWithJava/AndroidManifest.xml
+++ b/testapps/javaProjectTest/lib1/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.test.lib1"
       android:versionCode="1"
-      android:versionName="1.0" package="com.android.tests.basicProjectWithJava">
-    <uses-sdk android:minSdkVersion="AOSP" />
-
-    <application android:icon="@drawable/icon" android:label="@string/app_name">
-        <activity android:label="@string/app_name" android:name="Main">
+      android:versionName="1.0">
+    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
+        <activity android:name="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
+</manifest>
diff --git a/testapps/javaProjectTest/lib1/ant.properties b/testapps/javaProjectTest/lib1/ant.properties
new file mode 100644
index 0000000..b0971e8
--- /dev/null
+++ b/testapps/javaProjectTest/lib1/ant.properties
@@ -0,0 +1,17 @@
+# 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/javaProjectTest/lib1/build.xml b/testapps/javaProjectTest/lib1/build.xml
new file mode 100644
index 0000000..2a15ae6
--- /dev/null
+++ b/testapps/javaProjectTest/lib1/build.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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
+         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/javaProjectTest/lib1/libs/android-support-v4.jar b/testapps/javaProjectTest/lib1/libs/android-support-v4.jar
new file mode 100644
index 0000000..d006198
--- /dev/null
+++ b/testapps/javaProjectTest/lib1/libs/android-support-v4.jar
diff --git a/testapps/javaProjectTest/lib1/proguard-project.txt b/testapps/javaProjectTest/lib1/proguard-project.txt
new file mode 100644
index 0000000..f2fe155
--- /dev/null
+++ b/testapps/javaProjectTest/lib1/proguard-project.txt
@@ -0,0 +1,20 @@
+# 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/javaProjectTest/lib1/project.properties b/testapps/javaProjectTest/lib1/project.properties
new file mode 100644
index 0000000..36f1594
--- /dev/null
+++ b/testapps/javaProjectTest/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/javaProjectTest/lib1/res/drawable-hdpi/ic_launcher.png b/testapps/javaProjectTest/lib1/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..8074c4c
--- /dev/null
+++ b/testapps/javaProjectTest/lib1/res/drawable-hdpi/ic_launcher.png
diff --git a/testapps/javaProjectTest/lib1/res/drawable-ldpi/ic_launcher.png b/testapps/javaProjectTest/lib1/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000..1095584
--- /dev/null
+++ b/testapps/javaProjectTest/lib1/res/drawable-ldpi/ic_launcher.png
diff --git a/testapps/javaProjectTest/lib1/res/drawable-mdpi/ic_launcher.png b/testapps/javaProjectTest/lib1/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..a07c69f
--- /dev/null
+++ b/testapps/javaProjectTest/lib1/res/drawable-mdpi/ic_launcher.png
diff --git a/testapps/javaProjectTest/lib1/res/layout/main.xml b/testapps/javaProjectTest/lib1/res/layout/main.xml
new file mode 100644
index 0000000..b79cddb
--- /dev/null
+++ b/testapps/javaProjectTest/lib1/res/layout/main.xml
@@ -0,0 +1,13 @@
+<?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="Hello World, Main"
+    />
+</LinearLayout>
+
diff --git a/testapps/javaProjectTest/lib1/res/values/strings.xml b/testapps/javaProjectTest/lib1/res/values/strings.xml
new file mode 100644
index 0000000..549e4ea
--- /dev/null
+++ b/testapps/javaProjectTest/lib1/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Main</string>
+</resources>
diff --git a/testapps/javaProjectTest/lib1/src/com/android/test/lib1/Main.java b/testapps/javaProjectTest/lib1/src/com/android/test/lib1/Main.java
new file mode 100644
index 0000000..116f14a
--- /dev/null
+++ b/testapps/javaProjectTest/lib1/src/com/android/test/lib1/Main.java
@@ -0,0 +1,15 @@
+package com.android.test.lib1;
+
+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.main);
+    }
+}
diff --git a/testapps/javaProjectTest/lib2/.classpath b/testapps/javaProjectTest/lib2/.classpath
new file mode 100644
index 0000000..71cf1b1
--- /dev/null
+++ b/testapps/javaProjectTest/lib2/.classpath
@@ -0,0 +1,10 @@
+<?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 combineaccessrules="false" kind="src" path="/javaProject"/>
+	<classpathentry kind="lib" path="libs/android-support-v4.jar"/>
+	<classpathentry kind="output" path="bin/classes"/>
+</classpath>
diff --git a/testapps/javaProjectTest/lib2/.project b/testapps/javaProjectTest/lib2/.project
new file mode 100644
index 0000000..2b723ab
--- /dev/null
+++ b/testapps/javaProjectTest/lib2/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>Lib2</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/javaProjectTest/lib2/AndroidManifest.xml b/testapps/javaProjectTest/lib2/AndroidManifest.xml
new file mode 100644
index 0000000..cd7393c
--- /dev/null
+++ b/testapps/javaProjectTest/lib2/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.android.test.lib2"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application android:label="@string/app_name" android:icon="@drawable/ic_launcher">
+        <activity android:name="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>
diff --git a/testapps/javaProjectTest/lib2/ant.properties b/testapps/javaProjectTest/lib2/ant.properties
new file mode 100644
index 0000000..b0971e8
--- /dev/null
+++ b/testapps/javaProjectTest/lib2/ant.properties
@@ -0,0 +1,17 @@
+# 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/javaProjectTest/lib2/build.xml b/testapps/javaProjectTest/lib2/build.xml
new file mode 100644
index 0000000..3d36fda
--- /dev/null
+++ b/testapps/javaProjectTest/lib2/build.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project name="lib2" 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/javaProjectTest/lib2/libs/android-support-v4.jar b/testapps/javaProjectTest/lib2/libs/android-support-v4.jar
new file mode 100644
index 0000000..d006198
--- /dev/null
+++ b/testapps/javaProjectTest/lib2/libs/android-support-v4.jar
diff --git a/testapps/javaProjectTest/lib2/proguard-project.txt b/testapps/javaProjectTest/lib2/proguard-project.txt
new file mode 100644
index 0000000..f2fe155
--- /dev/null
+++ b/testapps/javaProjectTest/lib2/proguard-project.txt
@@ -0,0 +1,20 @@
+# 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/javaProjectTest/lib2/project.properties b/testapps/javaProjectTest/lib2/project.properties
new file mode 100644
index 0000000..36f1594
--- /dev/null
+++ b/testapps/javaProjectTest/lib2/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/javaProjectTest/lib2/res/drawable-hdpi/ic_launcher.png b/testapps/javaProjectTest/lib2/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000..8074c4c
--- /dev/null
+++ b/testapps/javaProjectTest/lib2/res/drawable-hdpi/ic_launcher.png
diff --git a/testapps/javaProjectTest/lib2/res/drawable-ldpi/ic_launcher.png b/testapps/javaProjectTest/lib2/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000..1095584
--- /dev/null
+++ b/testapps/javaProjectTest/lib2/res/drawable-ldpi/ic_launcher.png
diff --git a/testapps/javaProjectTest/lib2/res/drawable-mdpi/ic_launcher.png b/testapps/javaProjectTest/lib2/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000..a07c69f
--- /dev/null
+++ b/testapps/javaProjectTest/lib2/res/drawable-mdpi/ic_launcher.png
diff --git a/testapps/javaProjectTest/lib2/res/layout/main.xml b/testapps/javaProjectTest/lib2/res/layout/main.xml
new file mode 100644
index 0000000..b79cddb
--- /dev/null
+++ b/testapps/javaProjectTest/lib2/res/layout/main.xml
@@ -0,0 +1,13 @@
+<?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="Hello World, Main"
+    />
+</LinearLayout>
+
diff --git a/testapps/javaProjectTest/lib2/res/values/strings.xml b/testapps/javaProjectTest/lib2/res/values/strings.xml
new file mode 100644
index 0000000..549e4ea
--- /dev/null
+++ b/testapps/javaProjectTest/lib2/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Main</string>
+</resources>
diff --git a/testapps/javaProjectTest/lib2/src/com/android/test/lib2/Main.java b/testapps/javaProjectTest/lib2/src/com/android/test/lib2/Main.java
new file mode 100644
index 0000000..45dad32
--- /dev/null
+++ b/testapps/javaProjectTest/lib2/src/com/android/test/lib2/Main.java
@@ -0,0 +1,15 @@
+package com.android.test.lib2;
+
+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.main);
+    }
+}