diff options
Diffstat (limited to 'testapps')
-rw-r--r-- | testapps/basicJar/.classpath | 6 | ||||
-rw-r--r-- | testapps/basicJar/.project | 17 | ||||
-rw-r--r-- | testapps/basicJar/src/com/android/tests/basicjar/BasicJar.java | 30 | ||||
-rw-r--r-- | testapps/basicJar/src/com/android/tests/basicjar/Foo.java | 16 | ||||
-rw-r--r-- | testapps/basicJar/src/com/android/tests/basicjar/basicJar.txt | 1 | ||||
-rw-r--r-- | testapps/jarCheckTests1/SUCCESS | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/app/.classpath (renamed from testapps/jarCheckTests2/basicProjectWithSupport/.classpath) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/app/.project (renamed from testapps/jarCheckTests2/basicProjectWithSupport/.project) | 2 | ||||
-rw-r--r-- | testapps/jarCheckTests1/app/AndroidManifest.xml (renamed from testapps/jarCheckTests1/basicProjectWithSupport/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/app/ant.properties (renamed from testapps/jarCheckTests1/basicLibWithSupport/ant.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/app/build.xml (renamed from testapps/jarCheckTests1/basicProjectWithSupport/build.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/app/libs/android-support-v4.jar (renamed from testapps/jarCheckTests1/basicLibWithSupport/libs/android-support-v4.jar) | bin | 247894 -> 247894 bytes | |||
-rw-r--r-- | testapps/jarCheckTests1/app/libs/foo.txt (renamed from testapps/jarCheckTests1/basicProjectWithSupport/libs/foo.txt) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/app/proguard-project.txt (renamed from testapps/jarCheckTests1/basicLibWithSupport/proguard-project.txt) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/app/project.properties | 13 | ||||
-rw-r--r-- | testapps/jarCheckTests1/app/res/layout/main.xml (renamed from testapps/jarCheckTests1/basicLibWithSupport/res/layout/main.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/app/res/values/strings.xml (renamed from testapps/jarCheckTests1/basicLibWithSupport/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/app/src/com/android/tests/projectwithsupport/MyActivity.java (renamed from testapps/jarCheckTests1/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/basicProjectWithSupport/project.properties | 13 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib1/.classpath (renamed from testapps/jarCheckTests2/basicLibWithSupport/.classpath) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib1/.project | 33 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib1/AndroidManifest.xml (renamed from testapps/jarCheckTests1/basicLibWithSupport/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib1/ant.properties (renamed from testapps/jarCheckTests1/basicLibWithSupport2/ant.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib1/build.xml (renamed from testapps/jarCheckTests1/basicLibWithSupport/build.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib1/libs/android-support-v4.jar (renamed from testapps/jarCheckTests1/basicLibWithSupport2/libs/android-support-v4.jar) | bin | 247894 -> 247894 bytes | |||
-rw-r--r-- | testapps/jarCheckTests1/lib1/proguard-project.txt (renamed from testapps/jarCheckTests1/basicLibWithSupport2/proguard-project.txt) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib1/project.properties (renamed from testapps/jarCheckTests1/basicLibWithSupport/project.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib1/res/layout/main.xml (renamed from testapps/jarCheckTests1/basicLibWithSupport2/res/layout/main.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib1/res/values/strings.xml (renamed from testapps/jarCheckTests1/basicLibWithSupport2/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib1/src/com/android/tests/libwithsupport/MyActivity.java (renamed from testapps/jarCheckTests1/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib2/.classpath (renamed from testapps/jarCheckTests2/basicLibWithSupport2/.classpath) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib2/.project | 33 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib2/AndroidManifest.xml (renamed from testapps/jarCheckTests1/basicLibWithSupport2/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib2/ant.properties (renamed from testapps/jarCheckTests1/basicProjectWithSupport/ant.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib2/build.xml (renamed from testapps/jarCheckTests1/basicLibWithSupport2/build.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib2/libs/android-support-v4.jar (renamed from testapps/jarCheckTests1/basicProjectWithSupport/libs/android-support-v4.jar) | bin | 247894 -> 247894 bytes | |||
-rw-r--r-- | testapps/jarCheckTests1/lib2/proguard-project.txt (renamed from testapps/jarCheckTests1/basicProjectWithSupport/proguard-project.txt) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib2/project.properties (renamed from testapps/jarCheckTests1/basicLibWithSupport2/project.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib2/res/layout/main.xml (renamed from testapps/jarCheckTests1/basicProjectWithSupport/res/layout/main.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib2/res/values/strings.xml (renamed from testapps/jarCheckTests1/basicProjectWithSupport/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests1/lib2/src/com/android/tests/libwithsupport2/MyActivity.java (renamed from testapps/jarCheckTests1/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/FAIL | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/app/.classpath | 8 | ||||
-rw-r--r-- | testapps/jarCheckTests2/app/.project | 33 | ||||
-rw-r--r-- | testapps/jarCheckTests2/app/AndroidManifest.xml (renamed from testapps/jarCheckTests2/basicProjectWithSupport/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/app/ant.properties (renamed from testapps/jarCheckTests2/basicLibWithSupport/ant.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/app/build.xml (renamed from testapps/jarCheckTests2/basicProjectWithSupport/build.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/app/libs/foo.txt (renamed from testapps/jarCheckTests2/basicProjectWithSupport/libs/foo.txt) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/app/proguard-project.txt (renamed from testapps/jarCheckTests2/basicLibWithSupport/proguard-project.txt) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/app/project.properties | 13 | ||||
-rw-r--r-- | testapps/jarCheckTests2/app/res/layout/main.xml (renamed from testapps/jarCheckTests2/basicLibWithSupport/res/layout/main.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/app/res/values/strings.xml (renamed from testapps/jarCheckTests2/basicLibWithSupport/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/app/src/com/android/tests/projectwithsupport/MyActivity.java (renamed from testapps/jarCheckTests2/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/basicProjectWithSupport/project.properties | 13 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib1/.classpath | 9 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib1/.project (renamed from testapps/jarCheckTests2/basicLibWithSupport/.project) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib1/AndroidManifest.xml (renamed from testapps/jarCheckTests2/basicLibWithSupport/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib1/ant.properties (renamed from testapps/jarCheckTests2/basicLibWithSupport2/ant.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib1/build.xml (renamed from testapps/jarCheckTests2/basicLibWithSupport/build.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib1/libs/android-support-v4.jar (renamed from testapps/jarCheckTests2/basicLibWithSupport/libs/android-support-v4.jar) | bin | 247894 -> 247894 bytes | |||
-rw-r--r-- | testapps/jarCheckTests2/lib1/proguard-project.txt (renamed from testapps/jarCheckTests2/basicLibWithSupport2/proguard-project.txt) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib1/project.properties (renamed from testapps/jarCheckTests2/basicLibWithSupport/project.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib1/res/layout/main.xml (renamed from testapps/jarCheckTests2/basicLibWithSupport2/res/layout/main.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib1/res/values/strings.xml (renamed from testapps/jarCheckTests2/basicLibWithSupport2/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib1/src/com/android/tests/libwithsupport/MyActivity.java (renamed from testapps/jarCheckTests2/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib2/.classpath | 9 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib2/.project (renamed from testapps/jarCheckTests2/basicLibWithSupport2/.project) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib2/AndroidManifest.xml (renamed from testapps/jarCheckTests2/basicLibWithSupport2/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib2/ant.properties (renamed from testapps/jarCheckTests2/basicProjectWithSupport/ant.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib2/build.xml (renamed from testapps/jarCheckTests2/basicLibWithSupport2/build.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib2/libs/android-support-v4.jar (renamed from testapps/jarCheckTests2/basicLibWithSupport2/libs/android-support-v4.jar) | bin | 244970 -> 244970 bytes | |||
-rw-r--r-- | testapps/jarCheckTests2/lib2/proguard-project.txt (renamed from testapps/jarCheckTests2/basicProjectWithSupport/proguard-project.txt) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib2/project.properties (renamed from testapps/jarCheckTests2/basicLibWithSupport2/project.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib2/res/layout/main.xml (renamed from testapps/jarCheckTests2/basicProjectWithSupport/res/layout/main.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib2/res/values/strings.xml (renamed from testapps/jarCheckTests2/basicProjectWithSupport/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests2/lib2/src/com/android/tests/libwithsupport2/MyActivity.java (renamed from testapps/jarCheckTests2/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/SUCCESS | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/app/.classpath (renamed from testapps/libWithLibTest/basicLib/.classpath) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/app/.project | 33 | ||||
-rw-r--r-- | testapps/jarCheckTests3/app/AndroidManifest.xml (renamed from testapps/jarCheckTests3/basicProjectWithSupport/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/app/ant.properties (renamed from testapps/jarCheckTests3/basicLibWithSupport/ant.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/app/build.xml (renamed from testapps/jarCheckTests3/basicProjectWithSupport/build.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/app/libs/foo.txt (renamed from testapps/jarCheckTests3/basicProjectWithSupport/libs/foo.txt) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/app/proguard-project.txt (renamed from testapps/jarCheckTests3/basicLibWithSupport/proguard-project.txt) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/app/project.properties | 13 | ||||
-rw-r--r-- | testapps/jarCheckTests3/app/res/layout/main.xml (renamed from testapps/jarCheckTests3/basicLibWithSupport/res/layout/main.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/app/res/values/strings.xml (renamed from testapps/jarCheckTests3/basicLibWithSupport/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/app/src/com/android/tests/projectwithsupport/MyActivity.java (renamed from testapps/jarCheckTests3/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/basicProjectWithSupport/project.properties | 13 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib1/.classpath | 9 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib1/.project | 33 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib1/AndroidManifest.xml (renamed from testapps/jarCheckTests3/basicLibWithSupport/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib1/ant.properties (renamed from testapps/jarCheckTests3/basicLibWithSupport2/ant.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib1/build.xml (renamed from testapps/jarCheckTests3/basicLibWithSupport/build.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib1/libs/android-support-v4.jar (renamed from testapps/jarCheckTests3/basicLibWithSupport/libs/android-support-v4.jar) | bin | 247894 -> 247894 bytes | |||
-rw-r--r-- | testapps/jarCheckTests3/lib1/proguard-project.txt (renamed from testapps/jarCheckTests3/basicLibWithSupport2/proguard-project.txt) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib1/project.properties (renamed from testapps/jarCheckTests3/basicLibWithSupport/project.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib1/res/layout/main.xml (renamed from testapps/jarCheckTests3/basicLibWithSupport2/res/layout/main.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib1/res/values/strings.xml (renamed from testapps/jarCheckTests3/basicLibWithSupport2/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib1/src/com/android/tests/libwithsupport/MyActivity.java (renamed from testapps/jarCheckTests3/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib2/.classpath | 9 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib2/.project | 33 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib2/AndroidManifest.xml (renamed from testapps/jarCheckTests3/basicLibWithSupport2/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib2/ant.properties (renamed from testapps/jarCheckTests3/basicProjectWithSupport/ant.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib2/build.xml (renamed from testapps/jarCheckTests3/basicLibWithSupport2/build.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib2/libs/android-support-v13.jar (renamed from testapps/jarCheckTests3/basicLibWithSupport2/libs/android-support-v13.jar) | bin | 307683 -> 307683 bytes | |||
-rw-r--r-- | testapps/jarCheckTests3/lib2/proguard-project.txt (renamed from testapps/jarCheckTests3/basicProjectWithSupport/proguard-project.txt) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib2/project.properties (renamed from testapps/jarCheckTests3/basicLibWithSupport2/project.properties) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib2/res/layout/main.xml (renamed from testapps/jarCheckTests3/basicProjectWithSupport/res/layout/main.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib2/res/values/strings.xml (renamed from testapps/jarCheckTests3/basicProjectWithSupport/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | testapps/jarCheckTests3/lib2/src/com/android/tests/libwithsupport2/MyActivity.java (renamed from testapps/jarCheckTests3/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java) | 0 | ||||
-rw-r--r-- | testapps/javaProjectTest/ECLIPSEONLY | 0 | ||||
-rw-r--r-- | testapps/javaProjectTest/SUCCESS | 0 | ||||
-rw-r--r-- | testapps/javaProjectTest/app/.project | 2 | ||||
-rw-r--r-- | testapps/javaProjectTest/app/AndroidManifest.xml | 4 | ||||
-rw-r--r-- | testapps/javaProjectTest/app/res/layout/main.xml | 60 | ||||
-rw-r--r-- | testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/Main.java | 22 | ||||
-rw-r--r-- | testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/MyTextView.java | 27 | ||||
-rw-r--r-- | testapps/javaProjectTest/app/src/com/android/tests/javaprojecttest/app/Main.java | 38 | ||||
-rw-r--r-- | testapps/javaProjectTest/javaProject/.classpath | 2 | ||||
-rw-r--r-- | testapps/javaProjectTest/javaProject/.project | 2 | ||||
-rw-r--r-- | testapps/javaProjectTest/javaProject/libs/basicJar.jar | bin | 2886 -> 0 bytes | |||
-rw-r--r-- | testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java | 16 | ||||
-rw-r--r-- | testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/foo.txt | 1 | ||||
-rw-r--r-- | testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.java | 30 | ||||
-rw-r--r-- | testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.txt | 1 | ||||
-rw-r--r-- | testapps/javaProjectTest/javaProject2/.classpath | 7 | ||||
-rw-r--r-- | testapps/javaProjectTest/javaProject2/.project | 17 | ||||
-rw-r--r-- | testapps/javaProjectTest/javaProject2/libs/basicJar.jar | bin | 0 -> 1813 bytes | |||
-rw-r--r-- | testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.java | 30 | ||||
-rw-r--r-- | testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.txt | 1 | ||||
-rw-r--r-- | testapps/javaProjectTest/lib1/.classpath | 2 | ||||
-rw-r--r-- | testapps/javaProjectTest/lib1/.project | 2 | ||||
-rw-r--r-- | testapps/javaProjectTest/lib1/AndroidManifest.xml | 20 | ||||
-rw-r--r-- | testapps/javaProjectTest/lib1/build.xml | 83 | ||||
-rw-r--r-- | testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java | 30 | ||||
-rw-r--r-- | testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.txt | 1 | ||||
-rw-r--r-- | testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Main.java (renamed from testapps/javaProjectTest/lib2/src/com/android/test/lib2/Main.java) | 2 | ||||
-rw-r--r-- | testapps/javaProjectTest/lib2/.classpath | 2 | ||||
-rw-r--r-- | testapps/javaProjectTest/lib2/.project | 2 | ||||
-rw-r--r-- | testapps/javaProjectTest/lib2/AndroidManifest.xml | 20 | ||||
-rw-r--r-- | testapps/javaProjectTest/lib2/build.xml | 83 | ||||
-rw-r--r-- | testapps/javaProjectTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.java | 30 | ||||
-rw-r--r-- | testapps/javaProjectTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.txt | 1 | ||||
-rw-r--r-- | testapps/javaProjectTest/lib2/src/com/android/tests/javaprojecttest/lib2/Main.java (renamed from testapps/javaProjectTest/lib1/src/com/android/test/lib1/Main.java) | 2 | ||||
-rw-r--r-- | testapps/libWithLibTest/.DS_Store | bin | 0 -> 6148 bytes | |||
-rw-r--r-- | testapps/libWithLibTest/app/.classpath | 8 | ||||
-rw-r--r-- | testapps/libWithLibTest/app/.project (renamed from testapps/libWithLibTest/basicProjectWithLib/.project) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/app/AndroidManifest.xml (renamed from testapps/libWithLibTest/basicProjectWithLib/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/app/ant.properties (renamed from testapps/javaProjectTest/lib1/ant.properties) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/app/build.xml (renamed from testapps/libWithLibTest/basicLib/build.xml) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/app/proguard-project.txt (renamed from testapps/libWithLibTest/basicLib/proguard-project.txt) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/app/project.properties (renamed from testapps/libWithLibTest/basicProjectWithLib/project.properties) | 2 | ||||
-rw-r--r-- | testapps/libWithLibTest/app/res/values/strings.xml (renamed from testapps/libWithLibTest/basicProjectWithLib/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/basicLib/.project | 33 | ||||
-rw-r--r-- | testapps/libWithLibTest/basicLibWithJar/.project | 33 | ||||
-rw-r--r-- | testapps/libWithLibTest/basicLibWithJar/ant.properties | 17 | ||||
-rw-r--r-- | testapps/libWithLibTest/basicProjectWithLib/.classpath | 9 | ||||
-rw-r--r-- | testapps/libWithLibTest/basicProjectWithLib/ant.properties | 17 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib1/.classpath | 8 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib1/.project | 33 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib1/AndroidManifest.xml (renamed from testapps/libWithLibTest/basicLib/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib1/ant.properties (renamed from testapps/javaProjectTest/lib2/ant.properties) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib1/build.xml (renamed from testapps/libWithLibTest/basicLibWithJar/build.xml) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib1/proguard-project.txt (renamed from testapps/libWithLibTest/basicLibWithJar/proguard-project.txt) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib1/project.properties (renamed from testapps/libWithLibTest/basicLib/project.properties) | 2 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib1/res/drawable/icon.png (renamed from testapps/libWithLibTest/basicLib/res/drawable/icon.png) | bin | 2574 -> 2574 bytes | |||
-rw-r--r-- | testapps/libWithLibTest/lib1/res/layout/basiclib_main.xml (renamed from testapps/libWithLibTest/basicLib/res/layout/basiclib_main.xml) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib1/res/values/strings.xml (renamed from testapps/libWithLibTest/basicLib/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib1/src/com/android/tests/basiclib/Main.java (renamed from testapps/libWithLibTest/basicLib/src/com/android/tests/basiclib/Main.java) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib2/.classpath (renamed from testapps/libWithLibTest/basicLibWithJar/.classpath) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib2/.project | 33 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib2/AndroidManifest.xml (renamed from testapps/libWithLibTest/basicLibWithJar/AndroidManifest.xml) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib2/ant.properties (renamed from testapps/libWithLibTest/basicLib/ant.properties) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib2/build.xml (renamed from testapps/libWithLibTest/basicProjectWithLib/build.xml) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib2/libs/basicJar.jar (renamed from testapps/libWithLibTest/basicLibWithJar/libs/basicJar.jar) | bin | 2713 -> 2713 bytes | |||
-rw-r--r-- | testapps/libWithLibTest/lib2/proguard-project.txt (renamed from testapps/libWithLibTest/basicProjectWithLib/proguard-project.txt) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib2/project.properties (renamed from testapps/libWithLibTest/basicLibWithJar/project.properties) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib2/res/drawable/icon.png (renamed from testapps/libWithLibTest/basicLibWithJar/res/drawable/icon.png) | bin | 2574 -> 2574 bytes | |||
-rw-r--r-- | testapps/libWithLibTest/lib2/res/layout/basiclibwithjar_main.xml (renamed from testapps/libWithLibTest/basicLibWithJar/res/layout/basiclibwithjar_main.xml) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib2/res/layout/main.xml (renamed from testapps/libWithLibTest/basicLibWithJar/res/layout/main.xml) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib2/res/values/ids.xml (renamed from testapps/libWithLibTest/basicLibWithJar/res/values/ids.xml) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib2/res/values/strings.xml (renamed from testapps/libWithLibTest/basicLibWithJar/res/values/strings.xml) | 0 | ||||
-rw-r--r-- | testapps/libWithLibTest/lib2/src/com/android/tests/basiclibwithjar/Main.java (renamed from testapps/libWithLibTest/basicLibWithJar/src/com/android/tests/basiclibwithjar/Main.java) | 0 |
184 files changed, 689 insertions, 438 deletions
diff --git a/testapps/basicJar/.classpath b/testapps/basicJar/.classpath new file mode 100644 index 0000000..11a4c98 --- /dev/null +++ b/testapps/basicJar/.classpath @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="src" path="src"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="output" path="bin/classes"/> +</classpath> diff --git a/testapps/basicJar/.project b/testapps/basicJar/.project new file mode 100644 index 0000000..b7bfb91 --- /dev/null +++ b/testapps/basicJar/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>basicJar</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/testapps/basicJar/src/com/android/tests/basicjar/BasicJar.java b/testapps/basicJar/src/com/android/tests/basicjar/BasicJar.java new file mode 100644 index 0000000..3347951 --- /dev/null +++ b/testapps/basicJar/src/com/android/tests/basicjar/BasicJar.java @@ -0,0 +1,30 @@ +package com.android.tests.basicjar; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + +public class BasicJar { + + public static String getContent() { + InputStream input = BasicJar.class.getResourceAsStream("basicJar.txt"); + + BufferedReader reader = null; + try { + reader = new BufferedReader(new InputStreamReader(input, "UTF-8")); + + return reader.readLine(); + } catch (IOException e) { + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + } + } + } + + return "FAILED TO READ CONTENT"; + } +}
\ No newline at end of file diff --git a/testapps/basicJar/src/com/android/tests/basicjar/Foo.java b/testapps/basicJar/src/com/android/tests/basicjar/Foo.java deleted file mode 100644 index 6a9536f..0000000 --- a/testapps/basicJar/src/com/android/tests/basicjar/Foo.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.android.tests.basicjar; - -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); - } -}
\ No newline at end of file diff --git a/testapps/basicJar/src/com/android/tests/basicjar/basicJar.txt b/testapps/basicJar/src/com/android/tests/basicjar/basicJar.txt new file mode 100644 index 0000000..d5a8285 --- /dev/null +++ b/testapps/basicJar/src/com/android/tests/basicjar/basicJar.txt @@ -0,0 +1 @@ +SUCCESS from basicJar.jar
\ No newline at end of file diff --git a/testapps/jarCheckTests1/SUCCESS b/testapps/jarCheckTests1/SUCCESS new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/testapps/jarCheckTests1/SUCCESS diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/.classpath b/testapps/jarCheckTests1/app/.classpath index a4763d1..a4763d1 100644 --- a/testapps/jarCheckTests2/basicProjectWithSupport/.classpath +++ b/testapps/jarCheckTests1/app/.classpath diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/.project b/testapps/jarCheckTests1/app/.project index f236696..101d553 100644 --- a/testapps/jarCheckTests2/basicProjectWithSupport/.project +++ b/testapps/jarCheckTests1/app/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>test2App</name> + <name>jarCheckTests1-app</name> <comment></comment> <projects> </projects> diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/AndroidManifest.xml b/testapps/jarCheckTests1/app/AndroidManifest.xml index ff41761..ff41761 100644 --- a/testapps/jarCheckTests1/basicProjectWithSupport/AndroidManifest.xml +++ b/testapps/jarCheckTests1/app/AndroidManifest.xml diff --git a/testapps/jarCheckTests1/basicLibWithSupport/ant.properties b/testapps/jarCheckTests1/app/ant.properties index ee52d86..ee52d86 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport/ant.properties +++ b/testapps/jarCheckTests1/app/ant.properties diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/build.xml b/testapps/jarCheckTests1/app/build.xml index f3a3d91..f3a3d91 100644 --- a/testapps/jarCheckTests1/basicProjectWithSupport/build.xml +++ b/testapps/jarCheckTests1/app/build.xml diff --git a/testapps/jarCheckTests1/basicLibWithSupport/libs/android-support-v4.jar b/testapps/jarCheckTests1/app/libs/android-support-v4.jar Binary files differindex d006198..d006198 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport/libs/android-support-v4.jar +++ b/testapps/jarCheckTests1/app/libs/android-support-v4.jar diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/libs/foo.txt b/testapps/jarCheckTests1/app/libs/foo.txt index fe0c852..fe0c852 100644 --- a/testapps/jarCheckTests1/basicProjectWithSupport/libs/foo.txt +++ b/testapps/jarCheckTests1/app/libs/foo.txt diff --git a/testapps/jarCheckTests1/basicLibWithSupport/proguard-project.txt b/testapps/jarCheckTests1/app/proguard-project.txt index f2fe155..f2fe155 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport/proguard-project.txt +++ b/testapps/jarCheckTests1/app/proguard-project.txt diff --git a/testapps/jarCheckTests1/app/project.properties b/testapps/jarCheckTests1/app/project.properties new file mode 100644 index 0000000..1d28b51 --- /dev/null +++ b/testapps/jarCheckTests1/app/project.properties @@ -0,0 +1,13 @@ +# 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, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-15 +android.library.reference.1=../lib1 +android.library.reference.2=../lib2 diff --git a/testapps/jarCheckTests1/basicLibWithSupport/res/layout/main.xml b/testapps/jarCheckTests1/app/res/layout/main.xml index 7fe5dce..7fe5dce 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport/res/layout/main.xml +++ b/testapps/jarCheckTests1/app/res/layout/main.xml diff --git a/testapps/jarCheckTests1/basicLibWithSupport/res/values/strings.xml b/testapps/jarCheckTests1/app/res/values/strings.xml index 3fa203a..3fa203a 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport/res/values/strings.xml +++ b/testapps/jarCheckTests1/app/res/values/strings.xml diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java b/testapps/jarCheckTests1/app/src/com/android/tests/projectwithsupport/MyActivity.java index c065839..c065839 100644 --- a/testapps/jarCheckTests1/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java +++ b/testapps/jarCheckTests1/app/src/com/android/tests/projectwithsupport/MyActivity.java diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/project.properties b/testapps/jarCheckTests1/basicProjectWithSupport/project.properties deleted file mode 100644 index 3c58bfa..0000000 --- a/testapps/jarCheckTests1/basicProjectWithSupport/project.properties +++ /dev/null @@ -1,13 +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, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-15 -android.library.reference.1=../basicLibWithSupport -android.library.reference.2=../basicLibWithSupport2 diff --git a/testapps/jarCheckTests2/basicLibWithSupport/.classpath b/testapps/jarCheckTests1/lib1/.classpath index c5c5afd..c5c5afd 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport/.classpath +++ b/testapps/jarCheckTests1/lib1/.classpath diff --git a/testapps/jarCheckTests1/lib1/.project b/testapps/jarCheckTests1/lib1/.project new file mode 100644 index 0000000..f5f0058 --- /dev/null +++ b/testapps/jarCheckTests1/lib1/.project @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jarCheckTests1-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/jarCheckTests1/basicLibWithSupport/AndroidManifest.xml b/testapps/jarCheckTests1/lib1/AndroidManifest.xml index a634bdb..a634bdb 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport/AndroidManifest.xml +++ b/testapps/jarCheckTests1/lib1/AndroidManifest.xml diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/ant.properties b/testapps/jarCheckTests1/lib1/ant.properties index ee52d86..ee52d86 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport2/ant.properties +++ b/testapps/jarCheckTests1/lib1/ant.properties diff --git a/testapps/jarCheckTests1/basicLibWithSupport/build.xml b/testapps/jarCheckTests1/lib1/build.xml index 772f422..772f422 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport/build.xml +++ b/testapps/jarCheckTests1/lib1/build.xml diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/libs/android-support-v4.jar b/testapps/jarCheckTests1/lib1/libs/android-support-v4.jar Binary files differindex d006198..d006198 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport2/libs/android-support-v4.jar +++ b/testapps/jarCheckTests1/lib1/libs/android-support-v4.jar diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/proguard-project.txt b/testapps/jarCheckTests1/lib1/proguard-project.txt index f2fe155..f2fe155 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport2/proguard-project.txt +++ b/testapps/jarCheckTests1/lib1/proguard-project.txt diff --git a/testapps/jarCheckTests1/basicLibWithSupport/project.properties b/testapps/jarCheckTests1/lib1/project.properties index 23d80c4..23d80c4 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport/project.properties +++ b/testapps/jarCheckTests1/lib1/project.properties diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/res/layout/main.xml b/testapps/jarCheckTests1/lib1/res/layout/main.xml index 7fe5dce..7fe5dce 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport2/res/layout/main.xml +++ b/testapps/jarCheckTests1/lib1/res/layout/main.xml diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/res/values/strings.xml b/testapps/jarCheckTests1/lib1/res/values/strings.xml index 3fa203a..3fa203a 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport2/res/values/strings.xml +++ b/testapps/jarCheckTests1/lib1/res/values/strings.xml diff --git a/testapps/jarCheckTests1/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java b/testapps/jarCheckTests1/lib1/src/com/android/tests/libwithsupport/MyActivity.java index 2c316ca..2c316ca 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java +++ b/testapps/jarCheckTests1/lib1/src/com/android/tests/libwithsupport/MyActivity.java diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/.classpath b/testapps/jarCheckTests1/lib2/.classpath index c5c5afd..c5c5afd 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport2/.classpath +++ b/testapps/jarCheckTests1/lib2/.classpath diff --git a/testapps/jarCheckTests1/lib2/.project b/testapps/jarCheckTests1/lib2/.project new file mode 100644 index 0000000..1d49c52 --- /dev/null +++ b/testapps/jarCheckTests1/lib2/.project @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jarCheckTests1-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/jarCheckTests1/basicLibWithSupport2/AndroidManifest.xml b/testapps/jarCheckTests1/lib2/AndroidManifest.xml index 6fa91eb..6fa91eb 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport2/AndroidManifest.xml +++ b/testapps/jarCheckTests1/lib2/AndroidManifest.xml diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/ant.properties b/testapps/jarCheckTests1/lib2/ant.properties index ee52d86..ee52d86 100644 --- a/testapps/jarCheckTests1/basicProjectWithSupport/ant.properties +++ b/testapps/jarCheckTests1/lib2/ant.properties diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/build.xml b/testapps/jarCheckTests1/lib2/build.xml index 772f422..772f422 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport2/build.xml +++ b/testapps/jarCheckTests1/lib2/build.xml diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/libs/android-support-v4.jar b/testapps/jarCheckTests1/lib2/libs/android-support-v4.jar Binary files differindex d006198..d006198 100644 --- a/testapps/jarCheckTests1/basicProjectWithSupport/libs/android-support-v4.jar +++ b/testapps/jarCheckTests1/lib2/libs/android-support-v4.jar diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/proguard-project.txt b/testapps/jarCheckTests1/lib2/proguard-project.txt index f2fe155..f2fe155 100644 --- a/testapps/jarCheckTests1/basicProjectWithSupport/proguard-project.txt +++ b/testapps/jarCheckTests1/lib2/proguard-project.txt diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/project.properties b/testapps/jarCheckTests1/lib2/project.properties index 23d80c4..23d80c4 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport2/project.properties +++ b/testapps/jarCheckTests1/lib2/project.properties diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/res/layout/main.xml b/testapps/jarCheckTests1/lib2/res/layout/main.xml index 7fe5dce..7fe5dce 100644 --- a/testapps/jarCheckTests1/basicProjectWithSupport/res/layout/main.xml +++ b/testapps/jarCheckTests1/lib2/res/layout/main.xml diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/res/values/strings.xml b/testapps/jarCheckTests1/lib2/res/values/strings.xml index 3fa203a..3fa203a 100644 --- a/testapps/jarCheckTests1/basicProjectWithSupport/res/values/strings.xml +++ b/testapps/jarCheckTests1/lib2/res/values/strings.xml diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java b/testapps/jarCheckTests1/lib2/src/com/android/tests/libwithsupport2/MyActivity.java index fc97aa7..fc97aa7 100644 --- a/testapps/jarCheckTests1/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java +++ b/testapps/jarCheckTests1/lib2/src/com/android/tests/libwithsupport2/MyActivity.java diff --git a/testapps/jarCheckTests2/FAIL b/testapps/jarCheckTests2/FAIL new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/testapps/jarCheckTests2/FAIL diff --git a/testapps/jarCheckTests2/app/.classpath b/testapps/jarCheckTests2/app/.classpath new file mode 100644 index 0000000..3f9691c --- /dev/null +++ b/testapps/jarCheckTests2/app/.classpath @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> + <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="gen"/> + <classpathentry kind="output" path="bin/classes"/> +</classpath> diff --git a/testapps/jarCheckTests2/app/.project b/testapps/jarCheckTests2/app/.project new file mode 100644 index 0000000..fb6801c --- /dev/null +++ b/testapps/jarCheckTests2/app/.project @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jarCheckTests2-app</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/jarCheckTests2/basicProjectWithSupport/AndroidManifest.xml b/testapps/jarCheckTests2/app/AndroidManifest.xml index ff41761..ff41761 100644 --- a/testapps/jarCheckTests2/basicProjectWithSupport/AndroidManifest.xml +++ b/testapps/jarCheckTests2/app/AndroidManifest.xml diff --git a/testapps/jarCheckTests2/basicLibWithSupport/ant.properties b/testapps/jarCheckTests2/app/ant.properties index ee52d86..ee52d86 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport/ant.properties +++ b/testapps/jarCheckTests2/app/ant.properties diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/build.xml b/testapps/jarCheckTests2/app/build.xml index f3a3d91..f3a3d91 100644 --- a/testapps/jarCheckTests2/basicProjectWithSupport/build.xml +++ b/testapps/jarCheckTests2/app/build.xml diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/libs/foo.txt b/testapps/jarCheckTests2/app/libs/foo.txt index fe0c852..fe0c852 100644 --- a/testapps/jarCheckTests2/basicProjectWithSupport/libs/foo.txt +++ b/testapps/jarCheckTests2/app/libs/foo.txt diff --git a/testapps/jarCheckTests2/basicLibWithSupport/proguard-project.txt b/testapps/jarCheckTests2/app/proguard-project.txt index f2fe155..f2fe155 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport/proguard-project.txt +++ b/testapps/jarCheckTests2/app/proguard-project.txt diff --git a/testapps/jarCheckTests2/app/project.properties b/testapps/jarCheckTests2/app/project.properties new file mode 100644 index 0000000..1d28b51 --- /dev/null +++ b/testapps/jarCheckTests2/app/project.properties @@ -0,0 +1,13 @@ +# 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, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-15 +android.library.reference.1=../lib1 +android.library.reference.2=../lib2 diff --git a/testapps/jarCheckTests2/basicLibWithSupport/res/layout/main.xml b/testapps/jarCheckTests2/app/res/layout/main.xml index 7fe5dce..7fe5dce 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport/res/layout/main.xml +++ b/testapps/jarCheckTests2/app/res/layout/main.xml diff --git a/testapps/jarCheckTests2/basicLibWithSupport/res/values/strings.xml b/testapps/jarCheckTests2/app/res/values/strings.xml index 3fa203a..3fa203a 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport/res/values/strings.xml +++ b/testapps/jarCheckTests2/app/res/values/strings.xml diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java b/testapps/jarCheckTests2/app/src/com/android/tests/projectwithsupport/MyActivity.java index c065839..c065839 100644 --- a/testapps/jarCheckTests2/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java +++ b/testapps/jarCheckTests2/app/src/com/android/tests/projectwithsupport/MyActivity.java diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/project.properties b/testapps/jarCheckTests2/basicProjectWithSupport/project.properties deleted file mode 100644 index cf77006..0000000 --- a/testapps/jarCheckTests2/basicProjectWithSupport/project.properties +++ /dev/null @@ -1,13 +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, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-15 -android.library.reference.1=../basicLibWithSupport -android.library.reference.2=../basicLibWithSupport2
\ No newline at end of file diff --git a/testapps/jarCheckTests2/lib1/.classpath b/testapps/jarCheckTests2/lib1/.classpath new file mode 100644 index 0000000..386ce12 --- /dev/null +++ b/testapps/jarCheckTests2/lib1/.classpath @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> + <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> + <classpathentry kind="lib" path="libs/android-support-v4.jar"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="gen"/> + <classpathentry kind="output" path="bin/classes"/> +</classpath> diff --git a/testapps/jarCheckTests2/basicLibWithSupport/.project b/testapps/jarCheckTests2/lib1/.project index 467950f..467950f 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport/.project +++ b/testapps/jarCheckTests2/lib1/.project diff --git a/testapps/jarCheckTests2/basicLibWithSupport/AndroidManifest.xml b/testapps/jarCheckTests2/lib1/AndroidManifest.xml index a634bdb..a634bdb 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport/AndroidManifest.xml +++ b/testapps/jarCheckTests2/lib1/AndroidManifest.xml diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/ant.properties b/testapps/jarCheckTests2/lib1/ant.properties index ee52d86..ee52d86 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport2/ant.properties +++ b/testapps/jarCheckTests2/lib1/ant.properties diff --git a/testapps/jarCheckTests2/basicLibWithSupport/build.xml b/testapps/jarCheckTests2/lib1/build.xml index 772f422..772f422 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport/build.xml +++ b/testapps/jarCheckTests2/lib1/build.xml diff --git a/testapps/jarCheckTests2/basicLibWithSupport/libs/android-support-v4.jar b/testapps/jarCheckTests2/lib1/libs/android-support-v4.jar Binary files differindex d006198..d006198 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport/libs/android-support-v4.jar +++ b/testapps/jarCheckTests2/lib1/libs/android-support-v4.jar diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/proguard-project.txt b/testapps/jarCheckTests2/lib1/proguard-project.txt index f2fe155..f2fe155 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport2/proguard-project.txt +++ b/testapps/jarCheckTests2/lib1/proguard-project.txt diff --git a/testapps/jarCheckTests2/basicLibWithSupport/project.properties b/testapps/jarCheckTests2/lib1/project.properties index 23d80c4..23d80c4 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport/project.properties +++ b/testapps/jarCheckTests2/lib1/project.properties diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/res/layout/main.xml b/testapps/jarCheckTests2/lib1/res/layout/main.xml index 7fe5dce..7fe5dce 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport2/res/layout/main.xml +++ b/testapps/jarCheckTests2/lib1/res/layout/main.xml diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/res/values/strings.xml b/testapps/jarCheckTests2/lib1/res/values/strings.xml index 3fa203a..3fa203a 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport2/res/values/strings.xml +++ b/testapps/jarCheckTests2/lib1/res/values/strings.xml diff --git a/testapps/jarCheckTests2/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java b/testapps/jarCheckTests2/lib1/src/com/android/tests/libwithsupport/MyActivity.java index 2c316ca..2c316ca 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java +++ b/testapps/jarCheckTests2/lib1/src/com/android/tests/libwithsupport/MyActivity.java diff --git a/testapps/jarCheckTests2/lib2/.classpath b/testapps/jarCheckTests2/lib2/.classpath new file mode 100644 index 0000000..386ce12 --- /dev/null +++ b/testapps/jarCheckTests2/lib2/.classpath @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8"?> +<classpath> + <classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/> + <classpathentry kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/> + <classpathentry kind="lib" path="libs/android-support-v4.jar"/> + <classpathentry kind="src" path="src"/> + <classpathentry kind="src" path="gen"/> + <classpathentry kind="output" path="bin/classes"/> +</classpath> diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/.project b/testapps/jarCheckTests2/lib2/.project index efeaaae..efeaaae 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport2/.project +++ b/testapps/jarCheckTests2/lib2/.project diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/AndroidManifest.xml b/testapps/jarCheckTests2/lib2/AndroidManifest.xml index 6fa91eb..6fa91eb 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport2/AndroidManifest.xml +++ b/testapps/jarCheckTests2/lib2/AndroidManifest.xml diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/ant.properties b/testapps/jarCheckTests2/lib2/ant.properties index ee52d86..ee52d86 100644 --- a/testapps/jarCheckTests2/basicProjectWithSupport/ant.properties +++ b/testapps/jarCheckTests2/lib2/ant.properties diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/build.xml b/testapps/jarCheckTests2/lib2/build.xml index 772f422..772f422 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport2/build.xml +++ b/testapps/jarCheckTests2/lib2/build.xml diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/libs/android-support-v4.jar b/testapps/jarCheckTests2/lib2/libs/android-support-v4.jar Binary files differindex 1e90718..1e90718 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport2/libs/android-support-v4.jar +++ b/testapps/jarCheckTests2/lib2/libs/android-support-v4.jar diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/proguard-project.txt b/testapps/jarCheckTests2/lib2/proguard-project.txt index f2fe155..f2fe155 100644 --- a/testapps/jarCheckTests2/basicProjectWithSupport/proguard-project.txt +++ b/testapps/jarCheckTests2/lib2/proguard-project.txt diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/project.properties b/testapps/jarCheckTests2/lib2/project.properties index 23d80c4..23d80c4 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport2/project.properties +++ b/testapps/jarCheckTests2/lib2/project.properties diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/res/layout/main.xml b/testapps/jarCheckTests2/lib2/res/layout/main.xml index 7fe5dce..7fe5dce 100644 --- a/testapps/jarCheckTests2/basicProjectWithSupport/res/layout/main.xml +++ b/testapps/jarCheckTests2/lib2/res/layout/main.xml diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/res/values/strings.xml b/testapps/jarCheckTests2/lib2/res/values/strings.xml index 3fa203a..3fa203a 100644 --- a/testapps/jarCheckTests2/basicProjectWithSupport/res/values/strings.xml +++ b/testapps/jarCheckTests2/lib2/res/values/strings.xml diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java b/testapps/jarCheckTests2/lib2/src/com/android/tests/libwithsupport2/MyActivity.java index fc97aa7..fc97aa7 100644 --- a/testapps/jarCheckTests2/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java +++ b/testapps/jarCheckTests2/lib2/src/com/android/tests/libwithsupport2/MyActivity.java diff --git a/testapps/jarCheckTests3/SUCCESS b/testapps/jarCheckTests3/SUCCESS new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/testapps/jarCheckTests3/SUCCESS diff --git a/testapps/libWithLibTest/basicLib/.classpath b/testapps/jarCheckTests3/app/.classpath index a4763d1..a4763d1 100644 --- a/testapps/libWithLibTest/basicLib/.classpath +++ b/testapps/jarCheckTests3/app/.classpath diff --git a/testapps/jarCheckTests3/app/.project b/testapps/jarCheckTests3/app/.project new file mode 100644 index 0000000..f2075af --- /dev/null +++ b/testapps/jarCheckTests3/app/.project @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jarCheckTests3-app</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/jarCheckTests3/basicProjectWithSupport/AndroidManifest.xml b/testapps/jarCheckTests3/app/AndroidManifest.xml index ff41761..ff41761 100644 --- a/testapps/jarCheckTests3/basicProjectWithSupport/AndroidManifest.xml +++ b/testapps/jarCheckTests3/app/AndroidManifest.xml diff --git a/testapps/jarCheckTests3/basicLibWithSupport/ant.properties b/testapps/jarCheckTests3/app/ant.properties index ee52d86..ee52d86 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport/ant.properties +++ b/testapps/jarCheckTests3/app/ant.properties diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/build.xml b/testapps/jarCheckTests3/app/build.xml index f3a3d91..f3a3d91 100644 --- a/testapps/jarCheckTests3/basicProjectWithSupport/build.xml +++ b/testapps/jarCheckTests3/app/build.xml diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/libs/foo.txt b/testapps/jarCheckTests3/app/libs/foo.txt index fe0c852..fe0c852 100644 --- a/testapps/jarCheckTests3/basicProjectWithSupport/libs/foo.txt +++ b/testapps/jarCheckTests3/app/libs/foo.txt diff --git a/testapps/jarCheckTests3/basicLibWithSupport/proguard-project.txt b/testapps/jarCheckTests3/app/proguard-project.txt index f2fe155..f2fe155 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport/proguard-project.txt +++ b/testapps/jarCheckTests3/app/proguard-project.txt diff --git a/testapps/jarCheckTests3/app/project.properties b/testapps/jarCheckTests3/app/project.properties new file mode 100644 index 0000000..1d28b51 --- /dev/null +++ b/testapps/jarCheckTests3/app/project.properties @@ -0,0 +1,13 @@ +# 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, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-15 +android.library.reference.1=../lib1 +android.library.reference.2=../lib2 diff --git a/testapps/jarCheckTests3/basicLibWithSupport/res/layout/main.xml b/testapps/jarCheckTests3/app/res/layout/main.xml index 7fe5dce..7fe5dce 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport/res/layout/main.xml +++ b/testapps/jarCheckTests3/app/res/layout/main.xml diff --git a/testapps/jarCheckTests3/basicLibWithSupport/res/values/strings.xml b/testapps/jarCheckTests3/app/res/values/strings.xml index 3fa203a..3fa203a 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport/res/values/strings.xml +++ b/testapps/jarCheckTests3/app/res/values/strings.xml diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java b/testapps/jarCheckTests3/app/src/com/android/tests/projectwithsupport/MyActivity.java index c065839..c065839 100644 --- a/testapps/jarCheckTests3/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java +++ b/testapps/jarCheckTests3/app/src/com/android/tests/projectwithsupport/MyActivity.java diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/project.properties b/testapps/jarCheckTests3/basicProjectWithSupport/project.properties deleted file mode 100644 index 3c58bfa..0000000 --- a/testapps/jarCheckTests3/basicProjectWithSupport/project.properties +++ /dev/null @@ -1,13 +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, -# "ant.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-15 -android.library.reference.1=../basicLibWithSupport -android.library.reference.2=../basicLibWithSupport2 diff --git a/testapps/jarCheckTests3/lib1/.classpath b/testapps/jarCheckTests3/lib1/.classpath new file mode 100644 index 0000000..c5c5afd --- /dev/null +++ b/testapps/jarCheckTests3/lib1/.classpath @@ -0,0 +1,9 @@ +<?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 kind="lib" path="libs/android-support-v4.jar"/> + <classpathentry kind="output" path="bin/classes"/> +</classpath> diff --git a/testapps/jarCheckTests3/lib1/.project b/testapps/jarCheckTests3/lib1/.project new file mode 100644 index 0000000..14ffc89 --- /dev/null +++ b/testapps/jarCheckTests3/lib1/.project @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jarCheckTests3-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/jarCheckTests3/basicLibWithSupport/AndroidManifest.xml b/testapps/jarCheckTests3/lib1/AndroidManifest.xml index a634bdb..a634bdb 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport/AndroidManifest.xml +++ b/testapps/jarCheckTests3/lib1/AndroidManifest.xml diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/ant.properties b/testapps/jarCheckTests3/lib1/ant.properties index ee52d86..ee52d86 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport2/ant.properties +++ b/testapps/jarCheckTests3/lib1/ant.properties diff --git a/testapps/jarCheckTests3/basicLibWithSupport/build.xml b/testapps/jarCheckTests3/lib1/build.xml index 772f422..772f422 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport/build.xml +++ b/testapps/jarCheckTests3/lib1/build.xml diff --git a/testapps/jarCheckTests3/basicLibWithSupport/libs/android-support-v4.jar b/testapps/jarCheckTests3/lib1/libs/android-support-v4.jar Binary files differindex d006198..d006198 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport/libs/android-support-v4.jar +++ b/testapps/jarCheckTests3/lib1/libs/android-support-v4.jar diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/proguard-project.txt b/testapps/jarCheckTests3/lib1/proguard-project.txt index f2fe155..f2fe155 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport2/proguard-project.txt +++ b/testapps/jarCheckTests3/lib1/proguard-project.txt diff --git a/testapps/jarCheckTests3/basicLibWithSupport/project.properties b/testapps/jarCheckTests3/lib1/project.properties index 23d80c4..23d80c4 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport/project.properties +++ b/testapps/jarCheckTests3/lib1/project.properties diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/res/layout/main.xml b/testapps/jarCheckTests3/lib1/res/layout/main.xml index 7fe5dce..7fe5dce 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport2/res/layout/main.xml +++ b/testapps/jarCheckTests3/lib1/res/layout/main.xml diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/res/values/strings.xml b/testapps/jarCheckTests3/lib1/res/values/strings.xml index 3fa203a..3fa203a 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport2/res/values/strings.xml +++ b/testapps/jarCheckTests3/lib1/res/values/strings.xml diff --git a/testapps/jarCheckTests3/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java b/testapps/jarCheckTests3/lib1/src/com/android/tests/libwithsupport/MyActivity.java index 2c316ca..2c316ca 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java +++ b/testapps/jarCheckTests3/lib1/src/com/android/tests/libwithsupport/MyActivity.java diff --git a/testapps/jarCheckTests3/lib2/.classpath b/testapps/jarCheckTests3/lib2/.classpath new file mode 100644 index 0000000..c2f48bf --- /dev/null +++ b/testapps/jarCheckTests3/lib2/.classpath @@ -0,0 +1,9 @@ +<?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 kind="lib" path="libs/android-support-v13.jar"/> + <classpathentry kind="output" path="bin/classes"/> +</classpath> diff --git a/testapps/jarCheckTests3/lib2/.project b/testapps/jarCheckTests3/lib2/.project new file mode 100644 index 0000000..1441449 --- /dev/null +++ b/testapps/jarCheckTests3/lib2/.project @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>jarCheckTests3-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/jarCheckTests3/basicLibWithSupport2/AndroidManifest.xml b/testapps/jarCheckTests3/lib2/AndroidManifest.xml index 6fa91eb..6fa91eb 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport2/AndroidManifest.xml +++ b/testapps/jarCheckTests3/lib2/AndroidManifest.xml diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/ant.properties b/testapps/jarCheckTests3/lib2/ant.properties index ee52d86..ee52d86 100644 --- a/testapps/jarCheckTests3/basicProjectWithSupport/ant.properties +++ b/testapps/jarCheckTests3/lib2/ant.properties diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/build.xml b/testapps/jarCheckTests3/lib2/build.xml index 772f422..772f422 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport2/build.xml +++ b/testapps/jarCheckTests3/lib2/build.xml diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/libs/android-support-v13.jar b/testapps/jarCheckTests3/lib2/libs/android-support-v13.jar Binary files differindex c9354ec..c9354ec 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport2/libs/android-support-v13.jar +++ b/testapps/jarCheckTests3/lib2/libs/android-support-v13.jar diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/proguard-project.txt b/testapps/jarCheckTests3/lib2/proguard-project.txt index f2fe155..f2fe155 100644 --- a/testapps/jarCheckTests3/basicProjectWithSupport/proguard-project.txt +++ b/testapps/jarCheckTests3/lib2/proguard-project.txt diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/project.properties b/testapps/jarCheckTests3/lib2/project.properties index 23d80c4..23d80c4 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport2/project.properties +++ b/testapps/jarCheckTests3/lib2/project.properties diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/res/layout/main.xml b/testapps/jarCheckTests3/lib2/res/layout/main.xml index 7fe5dce..7fe5dce 100644 --- a/testapps/jarCheckTests3/basicProjectWithSupport/res/layout/main.xml +++ b/testapps/jarCheckTests3/lib2/res/layout/main.xml diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/res/values/strings.xml b/testapps/jarCheckTests3/lib2/res/values/strings.xml index 3fa203a..3fa203a 100644 --- a/testapps/jarCheckTests3/basicProjectWithSupport/res/values/strings.xml +++ b/testapps/jarCheckTests3/lib2/res/values/strings.xml diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java b/testapps/jarCheckTests3/lib2/src/com/android/tests/libwithsupport2/MyActivity.java index fc97aa7..fc97aa7 100644 --- a/testapps/jarCheckTests3/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java +++ b/testapps/jarCheckTests3/lib2/src/com/android/tests/libwithsupport2/MyActivity.java diff --git a/testapps/javaProjectTest/ECLIPSEONLY b/testapps/javaProjectTest/ECLIPSEONLY new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/testapps/javaProjectTest/ECLIPSEONLY diff --git a/testapps/javaProjectTest/SUCCESS b/testapps/javaProjectTest/SUCCESS new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/testapps/javaProjectTest/SUCCESS diff --git a/testapps/javaProjectTest/app/.project b/testapps/javaProjectTest/app/.project index 69b06f5..187fb0e 100644 --- a/testapps/javaProjectTest/app/.project +++ b/testapps/javaProjectTest/app/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>app</name> + <name>javaProjectTest-app</name> <comment></comment> <projects> </projects> diff --git a/testapps/javaProjectTest/app/AndroidManifest.xml b/testapps/javaProjectTest/app/AndroidManifest.xml index 0ccbb84..36ec8fb 100644 --- a/testapps/javaProjectTest/app/AndroidManifest.xml +++ b/testapps/javaProjectTest/app/AndroidManifest.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.tests.basicProjectWithJava" + package="com.android.tests.javaprojecttest.app" android:versionCode="1" android:versionName="1.0" > @@ -10,7 +10,7 @@ android:icon="@drawable/icon" android:label="@string/app_name" > <activity - android:name="Main" + android:name="com.android.tests.javaprojecttest.app.Main" android:label="@string/app_name" > <intent-filter> <action android:name="android.intent.action.MAIN" /> diff --git a/testapps/javaProjectTest/app/res/layout/main.xml b/testapps/javaProjectTest/app/res/layout/main.xml index 670dd32..251905a 100644 --- a/testapps/javaProjectTest/app/res/layout/main.xml +++ b/testapps/javaProjectTest/app/res/layout/main.xml @@ -1,18 +1,50 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="fill_parent" android:layout_height="fill_parent" - > -<TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:text="basicProjectWithJava" - android:id="@+id/text" - /> -<com.android.tests.basicProjectWithJava.MyTextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:id="@+id/text" - /> -</LinearLayout> + android:orientation="vertical" > + + <TextView + android:id="@+id/app" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="\\?" + tools:ignore="HardcodedText" /> + + <TextView + android:id="@+id/lib1" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="\\?" + tools:ignore="HardcodedText" /> + + <TextView + android:id="@+id/lib2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="\\?" + tools:ignore="HardcodedText" /> + + <TextView + android:id="@+id/javaProject1" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="\\?" + tools:ignore="HardcodedText" /> + + <TextView + android:id="@+id/javaProject2" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="\\?" + tools:ignore="HardcodedText" /> + + <TextView + android:id="@+id/basicJar" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="\\?" + tools:ignore="HardcodedText" /> + +</LinearLayout>
\ No newline at end of file diff --git a/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/Main.java b/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/Main.java deleted file mode 100644 index eb6be25..0000000 --- a/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/Main.java +++ /dev/null @@ -1,22 +0,0 @@ -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 diff --git a/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/MyTextView.java b/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/MyTextView.java deleted file mode 100644 index ae35dca..0000000 --- a/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/MyTextView.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.android.tests.basicProjectWithJava; - -import com.android.tests.basicJavaProject.Foo; - -import android.content.Context; -import android.util.AttributeSet; -import android.widget.TextView; - -public class MyTextView extends TextView { - - public MyTextView(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - - Foo f = new Foo(); - setText("Foo: " + f.getRandomFoo()); - } - - public MyTextView(Context context, AttributeSet attrs) { - super(context, attrs); - Foo f = new Foo(); - setText("Foo: " + f.getRandomFoo()); - } - - public MyTextView(Context context) { - super(context); - } -} diff --git a/testapps/javaProjectTest/app/src/com/android/tests/javaprojecttest/app/Main.java b/testapps/javaProjectTest/app/src/com/android/tests/javaprojecttest/app/Main.java new file mode 100644 index 0000000..233989e --- /dev/null +++ b/testapps/javaProjectTest/app/src/com/android/tests/javaprojecttest/app/Main.java @@ -0,0 +1,38 @@ +package com.android.tests.javaprojecttest.app; + +import android.app.Activity; +import android.os.Bundle; +import android.widget.TextView; + +import com.android.tests.basicjar.BasicJar; +import com.android.tests.javaprojecttest.javaproject.JavaProject; +import com.android.tests.javaprojecttest.javaproject2.JavaProject2; +import com.android.tests.javaprojecttest.lib1.Lib1; +import com.android.tests.javaprojecttest.lib2.Lib2; + +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); + + TextView tv = (TextView) findViewById(R.id.app); + tv.setText("app"); + + tv = (TextView) findViewById(R.id.lib1); + tv.setText("Lib1: " + Lib1.getContent()); + + tv = (TextView) findViewById(R.id.lib2); + tv.setText("Lib2: " + Lib2.getContent()); + + tv = (TextView) findViewById(R.id.javaProject1); + tv.setText("JavaProject: " + JavaProject.getContent()); + + tv = (TextView) findViewById(R.id.javaProject2); + tv.setText("JavaProject2: " + JavaProject2.getContent()); + + tv = (TextView) findViewById(R.id.basicJar); + tv.setText("BasicJar: " + BasicJar.getContent()); + } +}
\ No newline at end of file diff --git a/testapps/javaProjectTest/javaProject/.classpath b/testapps/javaProjectTest/javaProject/.classpath index 139d9a3..fef3993 100644 --- a/testapps/javaProjectTest/javaProject/.classpath +++ b/testapps/javaProjectTest/javaProject/.classpath @@ -2,6 +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 combineaccessrules="false" kind="src" path="/javaProjectTest-javaProject2"/> <classpathentry kind="output" path="bin"/> </classpath> diff --git a/testapps/javaProjectTest/javaProject/.project b/testapps/javaProjectTest/javaProject/.project index 225e486..8d99b08 100644 --- a/testapps/javaProjectTest/javaProject/.project +++ b/testapps/javaProjectTest/javaProject/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>javaProject</name> + <name>javaProjectTest-javaProject</name> <comment></comment> <projects> </projects> diff --git a/testapps/javaProjectTest/javaProject/libs/basicJar.jar b/testapps/javaProjectTest/javaProject/libs/basicJar.jar Binary files differdeleted file mode 100644 index 0b9c60c..0000000 --- a/testapps/javaProjectTest/javaProject/libs/basicJar.jar +++ /dev/null diff --git a/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java b/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java deleted file mode 100644 index 4a7d31c..0000000 --- a/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index 1c33723..0000000 --- a/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/foo.txt +++ /dev/null @@ -1 +0,0 @@ -blah blah
\ No newline at end of file diff --git a/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.java b/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.java new file mode 100644 index 0000000..4f40648 --- /dev/null +++ b/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.java @@ -0,0 +1,30 @@ +package com.android.tests.javaprojecttest.javaproject; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + +public class JavaProject { + + public static String getContent() { + InputStream input = JavaProject.class.getResourceAsStream("JavaProject.txt"); + + BufferedReader reader = null; + try { + reader = new BufferedReader(new InputStreamReader(input, "UTF-8")); + + return reader.readLine(); + } catch (IOException e) { + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + } + } + } + + return "FAILED TO READ CONTENT"; + } +} diff --git a/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.txt b/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.txt new file mode 100644 index 0000000..5742eaa --- /dev/null +++ b/testapps/javaProjectTest/javaProject/src/com/android/tests/javaprojecttest/javaproject/JavaProject.txt @@ -0,0 +1 @@ +SUCCESS from javaProject
\ No newline at end of file diff --git a/testapps/javaProjectTest/javaProject2/.classpath b/testapps/javaProjectTest/javaProject2/.classpath new file mode 100644 index 0000000..139d9a3 --- /dev/null +++ b/testapps/javaProjectTest/javaProject2/.classpath @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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/javaProjectTest/javaProject2/.project b/testapps/javaProjectTest/javaProject2/.project new file mode 100644 index 0000000..70658ff --- /dev/null +++ b/testapps/javaProjectTest/javaProject2/.project @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>javaProjectTest-javaProject2</name> + <comment></comment> + <projects> + </projects> + <buildSpec> + <buildCommand> + <name>org.eclipse.jdt.core.javabuilder</name> + <arguments> + </arguments> + </buildCommand> + </buildSpec> + <natures> + <nature>org.eclipse.jdt.core.javanature</nature> + </natures> +</projectDescription> diff --git a/testapps/javaProjectTest/javaProject2/libs/basicJar.jar b/testapps/javaProjectTest/javaProject2/libs/basicJar.jar Binary files differnew file mode 100644 index 0000000..a81b929 --- /dev/null +++ b/testapps/javaProjectTest/javaProject2/libs/basicJar.jar diff --git a/testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.java b/testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.java new file mode 100644 index 0000000..05d6c85 --- /dev/null +++ b/testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.java @@ -0,0 +1,30 @@ +package com.android.tests.javaprojecttest.javaproject2; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + +public class JavaProject2 { + + public static String getContent() { + InputStream input = JavaProject2.class.getResourceAsStream("JavaProject2.txt"); + + BufferedReader reader = null; + try { + reader = new BufferedReader(new InputStreamReader(input, "UTF-8")); + + return reader.readLine(); + } catch (IOException e) { + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + } + } + } + + return "FAILED TO READ CONTENT"; + } +} diff --git a/testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.txt b/testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.txt new file mode 100644 index 0000000..6ab43f7 --- /dev/null +++ b/testapps/javaProjectTest/javaProject2/src/com/android/tests/javaprojecttest/javaproject2/JavaProject2.txt @@ -0,0 +1 @@ +SUCCESS from javaProject2
\ No newline at end of file diff --git a/testapps/javaProjectTest/lib1/.classpath b/testapps/javaProjectTest/lib1/.classpath index 71cf1b1..8917f25 100644 --- a/testapps/javaProjectTest/lib1/.classpath +++ b/testapps/javaProjectTest/lib1/.classpath @@ -4,7 +4,7 @@ <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 combineaccessrules="false" kind="src" path="/javaProjectTest-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 index 596b85d..cac8ac1 100644 --- a/testapps/javaProjectTest/lib1/.project +++ b/testapps/javaProjectTest/lib1/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>Lib1</name> + <name>javaProjectTest-Lib1</name> <comment></comment> <projects> </projects> diff --git a/testapps/javaProjectTest/lib1/AndroidManifest.xml b/testapps/javaProjectTest/lib1/AndroidManifest.xml index 196db0b..c51696b 100644 --- a/testapps/javaProjectTest/lib1/AndroidManifest.xml +++ b/testapps/javaProjectTest/lib1/AndroidManifest.xml @@ -1,15 +1,21 @@ <?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"> - <application android:label="@string/app_name" android:icon="@drawable/ic_launcher"> - <activity android:name="Main" - android:label="@string/app_name"> + package="com.android.tests.javaprojecttest.lib1" + android:versionCode="1" + android:versionName="1.0" > + + <application + android:icon="@drawable/ic_launcher" + 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> + +</manifest>
\ No newline at end of file diff --git a/testapps/javaProjectTest/lib1/build.xml b/testapps/javaProjectTest/lib1/build.xml deleted file mode 100644 index 2a15ae6..0000000 --- a/testapps/javaProjectTest/lib1/build.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?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/src/com/android/tests/javaprojecttest/lib1/Lib1.java b/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java new file mode 100644 index 0000000..b1e7702 --- /dev/null +++ b/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java @@ -0,0 +1,30 @@ +package com.android.tests.javaprojecttest.lib1; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + +public class Lib1 { + + public static String getContent() { + InputStream input = Lib1.class.getResourceAsStream("Lib1.txt"); + + BufferedReader reader = null; + try { + reader = new BufferedReader(new InputStreamReader(input, "UTF-8")); + + return reader.readLine(); + } catch (IOException e) { + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + } + } + } + + return "FAILED TO READ CONTENT"; + } +} diff --git a/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.txt b/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.txt new file mode 100644 index 0000000..b3e210d --- /dev/null +++ b/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.txt @@ -0,0 +1 @@ +SUCCESS from Lib1
\ No newline at end of file diff --git a/testapps/javaProjectTest/lib2/src/com/android/test/lib2/Main.java b/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Main.java index 45dad32..f09e1cd 100644 --- a/testapps/javaProjectTest/lib2/src/com/android/test/lib2/Main.java +++ b/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Main.java @@ -1,4 +1,4 @@ -package com.android.test.lib2; +package com.android.tests.javaprojecttest.lib1; import android.app.Activity; import android.os.Bundle; diff --git a/testapps/javaProjectTest/lib2/.classpath b/testapps/javaProjectTest/lib2/.classpath index 71cf1b1..8917f25 100644 --- a/testapps/javaProjectTest/lib2/.classpath +++ b/testapps/javaProjectTest/lib2/.classpath @@ -4,7 +4,7 @@ <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 combineaccessrules="false" kind="src" path="/javaProjectTest-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 index 2b723ab..63d7a48 100644 --- a/testapps/javaProjectTest/lib2/.project +++ b/testapps/javaProjectTest/lib2/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>Lib2</name> + <name>javaProjectTest-Lib2</name> <comment></comment> <projects> </projects> diff --git a/testapps/javaProjectTest/lib2/AndroidManifest.xml b/testapps/javaProjectTest/lib2/AndroidManifest.xml index cd7393c..10d4a00 100644 --- a/testapps/javaProjectTest/lib2/AndroidManifest.xml +++ b/testapps/javaProjectTest/lib2/AndroidManifest.xml @@ -1,15 +1,21 @@ <?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"> + package="com.android.tests.javaprojecttest.lib2" + android:versionCode="1" + android:versionName="1.0" > + + <application + android:icon="@drawable/ic_launcher" + android:label="@string/app_name" > + <activity + android:name="com.android.tests.javaprojecttest.lib2.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> + +</manifest>
\ No newline at end of file diff --git a/testapps/javaProjectTest/lib2/build.xml b/testapps/javaProjectTest/lib2/build.xml deleted file mode 100644 index 3d36fda..0000000 --- a/testapps/javaProjectTest/lib2/build.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?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/src/com/android/tests/javaprojecttest/lib2/Lib2.java b/testapps/javaProjectTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.java new file mode 100644 index 0000000..fecc780 --- /dev/null +++ b/testapps/javaProjectTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.java @@ -0,0 +1,30 @@ +package com.android.tests.javaprojecttest.lib2; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + +public class Lib2 { + + public static String getContent() { + InputStream input = Lib2.class.getResourceAsStream("Lib2.txt"); + + BufferedReader reader = null; + try { + reader = new BufferedReader(new InputStreamReader(input, "UTF-8")); + + return reader.readLine(); + } catch (IOException e) { + } finally { + if (reader != null) { + try { + reader.close(); + } catch (IOException e) { + } + } + } + + return "FAILED TO READ CONTENT"; + } +} diff --git a/testapps/javaProjectTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.txt b/testapps/javaProjectTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.txt new file mode 100644 index 0000000..3ba8e35 --- /dev/null +++ b/testapps/javaProjectTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.txt @@ -0,0 +1 @@ +SUCCESS from Lib2
\ No newline at end of file diff --git a/testapps/javaProjectTest/lib1/src/com/android/test/lib1/Main.java b/testapps/javaProjectTest/lib2/src/com/android/tests/javaprojecttest/lib2/Main.java index 116f14a..1459896 100644 --- a/testapps/javaProjectTest/lib1/src/com/android/test/lib1/Main.java +++ b/testapps/javaProjectTest/lib2/src/com/android/tests/javaprojecttest/lib2/Main.java @@ -1,4 +1,4 @@ -package com.android.test.lib1; +package com.android.tests.javaprojecttest.lib2; import android.app.Activity; import android.os.Bundle; diff --git a/testapps/libWithLibTest/.DS_Store b/testapps/libWithLibTest/.DS_Store Binary files differnew file mode 100644 index 0000000..8d9d631 --- /dev/null +++ b/testapps/libWithLibTest/.DS_Store diff --git a/testapps/libWithLibTest/app/.classpath b/testapps/libWithLibTest/app/.classpath new file mode 100644 index 0000000..a4763d1 --- /dev/null +++ b/testapps/libWithLibTest/app/.classpath @@ -0,0 +1,8 @@ +<?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 kind="output" path="bin/classes"/> +</classpath> diff --git a/testapps/libWithLibTest/basicProjectWithLib/.project b/testapps/libWithLibTest/app/.project index 39feaec..39feaec 100644 --- a/testapps/libWithLibTest/basicProjectWithLib/.project +++ b/testapps/libWithLibTest/app/.project diff --git a/testapps/libWithLibTest/basicProjectWithLib/AndroidManifest.xml b/testapps/libWithLibTest/app/AndroidManifest.xml index 4870542..4870542 100644 --- a/testapps/libWithLibTest/basicProjectWithLib/AndroidManifest.xml +++ b/testapps/libWithLibTest/app/AndroidManifest.xml diff --git a/testapps/javaProjectTest/lib1/ant.properties b/testapps/libWithLibTest/app/ant.properties index b0971e8..b0971e8 100644 --- a/testapps/javaProjectTest/lib1/ant.properties +++ b/testapps/libWithLibTest/app/ant.properties diff --git a/testapps/libWithLibTest/basicLib/build.xml b/testapps/libWithLibTest/app/build.xml index bc17734..bc17734 100644 --- a/testapps/libWithLibTest/basicLib/build.xml +++ b/testapps/libWithLibTest/app/build.xml diff --git a/testapps/libWithLibTest/basicLib/proguard-project.txt b/testapps/libWithLibTest/app/proguard-project.txt index f2fe155..f2fe155 100644 --- a/testapps/libWithLibTest/basicLib/proguard-project.txt +++ b/testapps/libWithLibTest/app/proguard-project.txt diff --git a/testapps/libWithLibTest/basicProjectWithLib/project.properties b/testapps/libWithLibTest/app/project.properties index a418b0a..6133d73 100644 --- a/testapps/libWithLibTest/basicProjectWithLib/project.properties +++ b/testapps/libWithLibTest/app/project.properties @@ -9,4 +9,4 @@ # Project target. target=android-15 -android.library.reference.1=../basicLib +android.library.reference.1=../lib1 diff --git a/testapps/libWithLibTest/basicProjectWithLib/res/values/strings.xml b/testapps/libWithLibTest/app/res/values/strings.xml index bdca683..bdca683 100644 --- a/testapps/libWithLibTest/basicProjectWithLib/res/values/strings.xml +++ b/testapps/libWithLibTest/app/res/values/strings.xml diff --git a/testapps/libWithLibTest/basicLib/.project b/testapps/libWithLibTest/basicLib/.project deleted file mode 100644 index dbf57b4..0000000 --- a/testapps/libWithLibTest/basicLib/.project +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>libWithLibTest-basicLib</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/libWithLibTest/basicLibWithJar/.project b/testapps/libWithLibTest/basicLibWithJar/.project deleted file mode 100644 index ef8773c..0000000 --- a/testapps/libWithLibTest/basicLibWithJar/.project +++ /dev/null @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>libWithLibTest-basicLibWithJar</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/libWithLibTest/basicLibWithJar/ant.properties b/testapps/libWithLibTest/basicLibWithJar/ant.properties deleted file mode 100644 index b0971e8..0000000 --- a/testapps/libWithLibTest/basicLibWithJar/ant.properties +++ /dev/null @@ -1,17 +0,0 @@ -# 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/libWithLibTest/basicProjectWithLib/.classpath b/testapps/libWithLibTest/basicProjectWithLib/.classpath deleted file mode 100644 index abb4b65..0000000 --- a/testapps/libWithLibTest/basicProjectWithLib/.classpath +++ /dev/null @@ -1,9 +0,0 @@ -<?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 kind="lib" path="/libWithLibTest-basicLibWithJar/libs/basicJar.jar"/> - <classpathentry kind="output" path="bin/classes"/> -</classpath> diff --git a/testapps/libWithLibTest/basicProjectWithLib/ant.properties b/testapps/libWithLibTest/basicProjectWithLib/ant.properties deleted file mode 100644 index b0971e8..0000000 --- a/testapps/libWithLibTest/basicProjectWithLib/ant.properties +++ /dev/null @@ -1,17 +0,0 @@ -# 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/libWithLibTest/lib1/.classpath b/testapps/libWithLibTest/lib1/.classpath new file mode 100644 index 0000000..a4763d1 --- /dev/null +++ b/testapps/libWithLibTest/lib1/.classpath @@ -0,0 +1,8 @@ +<?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 kind="output" path="bin/classes"/> +</classpath> diff --git a/testapps/libWithLibTest/lib1/.project b/testapps/libWithLibTest/lib1/.project new file mode 100644 index 0000000..d256174 --- /dev/null +++ b/testapps/libWithLibTest/lib1/.project @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>libWithLibTest-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/libWithLibTest/basicLib/AndroidManifest.xml b/testapps/libWithLibTest/lib1/AndroidManifest.xml index aaf0fff..aaf0fff 100644 --- a/testapps/libWithLibTest/basicLib/AndroidManifest.xml +++ b/testapps/libWithLibTest/lib1/AndroidManifest.xml diff --git a/testapps/javaProjectTest/lib2/ant.properties b/testapps/libWithLibTest/lib1/ant.properties index b0971e8..b0971e8 100644 --- a/testapps/javaProjectTest/lib2/ant.properties +++ b/testapps/libWithLibTest/lib1/ant.properties diff --git a/testapps/libWithLibTest/basicLibWithJar/build.xml b/testapps/libWithLibTest/lib1/build.xml index bc17734..bc17734 100644 --- a/testapps/libWithLibTest/basicLibWithJar/build.xml +++ b/testapps/libWithLibTest/lib1/build.xml diff --git a/testapps/libWithLibTest/basicLibWithJar/proguard-project.txt b/testapps/libWithLibTest/lib1/proguard-project.txt index f2fe155..f2fe155 100644 --- a/testapps/libWithLibTest/basicLibWithJar/proguard-project.txt +++ b/testapps/libWithLibTest/lib1/proguard-project.txt diff --git a/testapps/libWithLibTest/basicLib/project.properties b/testapps/libWithLibTest/lib1/project.properties index 0a26b19..6bb4bd0 100644 --- a/testapps/libWithLibTest/basicLib/project.properties +++ b/testapps/libWithLibTest/lib1/project.properties @@ -10,4 +10,4 @@ # Project target. target=android-15 android.library=true -android.library.reference.1=../basicLibWithJar +android.library.reference.1=../lib2 diff --git a/testapps/libWithLibTest/basicLib/res/drawable/icon.png b/testapps/libWithLibTest/lib1/res/drawable/icon.png Binary files differindex a07c69f..a07c69f 100644 --- a/testapps/libWithLibTest/basicLib/res/drawable/icon.png +++ b/testapps/libWithLibTest/lib1/res/drawable/icon.png diff --git a/testapps/libWithLibTest/basicLib/res/layout/basiclib_main.xml b/testapps/libWithLibTest/lib1/res/layout/basiclib_main.xml index 37e5c2c..37e5c2c 100644 --- a/testapps/libWithLibTest/basicLib/res/layout/basiclib_main.xml +++ b/testapps/libWithLibTest/lib1/res/layout/basiclib_main.xml diff --git a/testapps/libWithLibTest/basicLib/res/values/strings.xml b/testapps/libWithLibTest/lib1/res/values/strings.xml index 1bdf988..1bdf988 100644 --- a/testapps/libWithLibTest/basicLib/res/values/strings.xml +++ b/testapps/libWithLibTest/lib1/res/values/strings.xml diff --git a/testapps/libWithLibTest/basicLib/src/com/android/tests/basiclib/Main.java b/testapps/libWithLibTest/lib1/src/com/android/tests/basiclib/Main.java index 0be5f11..0be5f11 100644 --- a/testapps/libWithLibTest/basicLib/src/com/android/tests/basiclib/Main.java +++ b/testapps/libWithLibTest/lib1/src/com/android/tests/basiclib/Main.java diff --git a/testapps/libWithLibTest/basicLibWithJar/.classpath b/testapps/libWithLibTest/lib2/.classpath index 1f92faf..1f92faf 100644 --- a/testapps/libWithLibTest/basicLibWithJar/.classpath +++ b/testapps/libWithLibTest/lib2/.classpath diff --git a/testapps/libWithLibTest/lib2/.project b/testapps/libWithLibTest/lib2/.project new file mode 100644 index 0000000..5f68270 --- /dev/null +++ b/testapps/libWithLibTest/lib2/.project @@ -0,0 +1,33 @@ +<?xml version="1.0" encoding="UTF-8"?> +<projectDescription> + <name>libWithLibTest-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/libWithLibTest/basicLibWithJar/AndroidManifest.xml b/testapps/libWithLibTest/lib2/AndroidManifest.xml index 1363206..1363206 100644 --- a/testapps/libWithLibTest/basicLibWithJar/AndroidManifest.xml +++ b/testapps/libWithLibTest/lib2/AndroidManifest.xml diff --git a/testapps/libWithLibTest/basicLib/ant.properties b/testapps/libWithLibTest/lib2/ant.properties index b0971e8..b0971e8 100644 --- a/testapps/libWithLibTest/basicLib/ant.properties +++ b/testapps/libWithLibTest/lib2/ant.properties diff --git a/testapps/libWithLibTest/basicProjectWithLib/build.xml b/testapps/libWithLibTest/lib2/build.xml index bc17734..bc17734 100644 --- a/testapps/libWithLibTest/basicProjectWithLib/build.xml +++ b/testapps/libWithLibTest/lib2/build.xml diff --git a/testapps/libWithLibTest/basicLibWithJar/libs/basicJar.jar b/testapps/libWithLibTest/lib2/libs/basicJar.jar Binary files differindex 8169064..8169064 100644 --- a/testapps/libWithLibTest/basicLibWithJar/libs/basicJar.jar +++ b/testapps/libWithLibTest/lib2/libs/basicJar.jar diff --git a/testapps/libWithLibTest/basicProjectWithLib/proguard-project.txt b/testapps/libWithLibTest/lib2/proguard-project.txt index f2fe155..f2fe155 100644 --- a/testapps/libWithLibTest/basicProjectWithLib/proguard-project.txt +++ b/testapps/libWithLibTest/lib2/proguard-project.txt diff --git a/testapps/libWithLibTest/basicLibWithJar/project.properties b/testapps/libWithLibTest/lib2/project.properties index 7414a68..7414a68 100644 --- a/testapps/libWithLibTest/basicLibWithJar/project.properties +++ b/testapps/libWithLibTest/lib2/project.properties diff --git a/testapps/libWithLibTest/basicLibWithJar/res/drawable/icon.png b/testapps/libWithLibTest/lib2/res/drawable/icon.png Binary files differindex a07c69f..a07c69f 100644 --- a/testapps/libWithLibTest/basicLibWithJar/res/drawable/icon.png +++ b/testapps/libWithLibTest/lib2/res/drawable/icon.png diff --git a/testapps/libWithLibTest/basicLibWithJar/res/layout/basiclibwithjar_main.xml b/testapps/libWithLibTest/lib2/res/layout/basiclibwithjar_main.xml index 5fefdd7..5fefdd7 100644 --- a/testapps/libWithLibTest/basicLibWithJar/res/layout/basiclibwithjar_main.xml +++ b/testapps/libWithLibTest/lib2/res/layout/basiclibwithjar_main.xml diff --git a/testapps/libWithLibTest/basicLibWithJar/res/layout/main.xml b/testapps/libWithLibTest/lib2/res/layout/main.xml index fc39355..fc39355 100644 --- a/testapps/libWithLibTest/basicLibWithJar/res/layout/main.xml +++ b/testapps/libWithLibTest/lib2/res/layout/main.xml diff --git a/testapps/libWithLibTest/basicLibWithJar/res/values/ids.xml b/testapps/libWithLibTest/lib2/res/values/ids.xml index 8cbe2cc..8cbe2cc 100644 --- a/testapps/libWithLibTest/basicLibWithJar/res/values/ids.xml +++ b/testapps/libWithLibTest/lib2/res/values/ids.xml diff --git a/testapps/libWithLibTest/basicLibWithJar/res/values/strings.xml b/testapps/libWithLibTest/lib2/res/values/strings.xml index 1701887..1701887 100644 --- a/testapps/libWithLibTest/basicLibWithJar/res/values/strings.xml +++ b/testapps/libWithLibTest/lib2/res/values/strings.xml diff --git a/testapps/libWithLibTest/basicLibWithJar/src/com/android/tests/basiclibwithjar/Main.java b/testapps/libWithLibTest/lib2/src/com/android/tests/basiclibwithjar/Main.java index a7b782a..a7b782a 100644 --- a/testapps/libWithLibTest/basicLibWithJar/src/com/android/tests/basiclibwithjar/Main.java +++ b/testapps/libWithLibTest/lib2/src/com/android/tests/basiclibwithjar/Main.java |