Merge changes I9f8bbb10,I8fc53e0f

* changes:
  Java project dependencies on libs are automatically added to main project.
  Move Android project with Java project dep test to its own folder.

1 files changed, 22 insertions, 0 deletions

diff --git a/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/Main.java b/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/Main.java
new file mode 100644
index 0000000..eb6be25
--- /dev/null
+++ b/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/Main.java
@@ -0,0 +1,22 @@
+package com.android.tests.basicProjectWithJava;
+
+import com.android.tests.basicJavaProject.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.main);
+
+        Foo foo = new Foo();
+
+        TextView tv = (TextView) findViewById(R.id.text);
+        tv.setText("basicProjectWithJava\nvalue from java project:" + foo.getRandomFoo());
+    }
+
+}
\ No newline at end of file