aboutsummaryrefslogtreecommitdiffstats
path: root/testapps/jarCheckTests3
diff options
context:
space:
mode:
Diffstat (limited to 'testapps/jarCheckTests3')
-rw-r--r--testapps/jarCheckTests3/SUCCESS0
-rw-r--r--testapps/jarCheckTests3/app/.classpath8
-rw-r--r--testapps/jarCheckTests3/app/.project33
-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 (renamed from testapps/jarCheckTests3/basicProjectWithSupport/project.properties)4
-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/lib1/.classpath9
-rw-r--r--testapps/jarCheckTests3/lib1/.project33
-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)bin247894 -> 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/.classpath9
-rw-r--r--testapps/jarCheckTests3/lib2/.project33
-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)bin307683 -> 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
34 files changed, 127 insertions, 2 deletions
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/jarCheckTests3/app/.classpath b/testapps/jarCheckTests3/app/.classpath
new file mode 100644
index 0000000..a4763d1
--- /dev/null
+++ b/testapps/jarCheckTests3/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/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/basicProjectWithSupport/project.properties b/testapps/jarCheckTests3/app/project.properties
index 3c58bfa..1d28b51 100644
--- a/testapps/jarCheckTests3/basicProjectWithSupport/project.properties
+++ b/testapps/jarCheckTests3/app/project.properties
@@ -9,5 +9,5 @@
# Project target.
target=android-15
-android.library.reference.1=../basicLibWithSupport
-android.library.reference.2=../basicLibWithSupport2
+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/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
index d006198..d006198 100644
--- a/testapps/jarCheckTests3/basicLibWithSupport/libs/android-support-v4.jar
+++ b/testapps/jarCheckTests3/lib1/libs/android-support-v4.jar
Binary files differ
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
index c9354ec..c9354ec 100644
--- a/testapps/jarCheckTests3/basicLibWithSupport2/libs/android-support-v13.jar
+++ b/testapps/jarCheckTests3/lib2/libs/android-support-v13.jar
Binary files differ
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