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.

2 files changed, 17 insertions, 0 deletions

diff --git a/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java b/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java
new file mode 100644
index 0000000..4a7d31c
--- /dev/null
+++ b/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java
@@ -0,0 +1,16 @@
+package com.android.tests.basicJavaProject;
+
+import java.util.Random;
+
+public class Foo {
+    public static int FOO = 42;
+
+    public int getFoo() {
+        return FOO;
+    }
+
+    public int getRandomFoo() {
+        Random r = new Random(System.currentTimeMillis());
+        return r.nextInt(FOO);
+    }
+}
diff --git a/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/foo.txt b/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/foo.txt
new file mode 100644
index 0000000..1c33723
--- /dev/null
+++ b/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/foo.txt
@@ -0,0 +1 @@
+blah blah
\ No newline at end of file