diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-03-01 13:49:11 -0800 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-03-01 13:49:11 -0800 |
| commit | fabbec5e8c5f7a052e337972f963cb3163243c36 (patch) | |
| tree | 3d1a0da540b588bf8090c3769635b23bb72a1a5f /testapps | |
| parent | 6c4f5c561d662456f55830a554c51c3d9670d094 (diff) | |
| download | sdk-fabbec5e8c5f7a052e337972f963cb3163243c36.zip sdk-fabbec5e8c5f7a052e337972f963cb3163243c36.tar.gz sdk-fabbec5e8c5f7a052e337972f963cb3163243c36.tar.bz2 | |
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
Diffstat (limited to 'testapps')
| -rw-r--r-- | testapps/javaProjectTest/javaProject/libs/basicJar.jar | bin | 2713 -> 2886 bytes | |||
| -rw-r--r-- | testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/foo.txt | 1 |
2 files changed, 1 insertions, 0 deletions
diff --git a/testapps/javaProjectTest/javaProject/libs/basicJar.jar b/testapps/javaProjectTest/javaProject/libs/basicJar.jar Binary files differindex 8169064..0b9c60c 100644 --- a/testapps/javaProjectTest/javaProject/libs/basicJar.jar +++ b/testapps/javaProjectTest/javaProject/libs/basicJar.jar 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 |