From 6c4f5c561d662456f55830a554c51c3d9670d094 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Wed, 29 Feb 2012 15:54:36 -0800 Subject: 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 --- .../src/com/android/tests/basicJavaProject/Foo.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java (limited to 'testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject') 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); + } +} -- cgit v1.1 From fabbec5e8c5f7a052e337972f963cb3163243c36 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Thu, 1 Mar 2012 13:49:11 -0800 Subject: Java project dependencies on libs are automatically added to main project. Android Library projects can reference other Java-only project. This used to be added to the library jar output. This created an issue if two Library projects were referenced by the same app as the java project was added to both library jar files. This change makes it so that the java project output is not in the library jar files but is instead added to the container of the main app as a project classpath entry. Change-Id: I9f8bbb104e29aede5393afd5ea4b8fe882145d49 --- .../javaProject/src/com/android/tests/basicJavaProject/foo.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/foo.txt (limited to 'testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject') 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 -- cgit v1.1