aboutsummaryrefslogtreecommitdiffstats
path: root/testapps/jarCheckTests2
diff options
context:
space:
mode:
Diffstat (limited to 'testapps/jarCheckTests2')
-rw-r--r--testapps/jarCheckTests2/FAIL0
-rw-r--r--testapps/jarCheckTests2/app/.classpath (renamed from testapps/jarCheckTests2/basicProjectWithSupport/.classpath)4
-rw-r--r--testapps/jarCheckTests2/app/.project (renamed from testapps/jarCheckTests2/basicProjectWithSupport/.project)2
-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 (renamed from testapps/jarCheckTests2/basicProjectWithSupport/project.properties)4
-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/lib1/.classpath (renamed from testapps/jarCheckTests2/basicLibWithSupport/.classpath)4
-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)bin247894 -> 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 (renamed from testapps/jarCheckTests2/basicLibWithSupport2/.classpath)4
-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)bin244970 -> 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
34 files changed, 9 insertions, 9 deletions
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/basicProjectWithSupport/.classpath b/testapps/jarCheckTests2/app/.classpath
index a4763d1..3f9691c 100644
--- a/testapps/jarCheckTests2/basicProjectWithSupport/.classpath
+++ b/testapps/jarCheckTests2/app/.classpath
@@ -1,8 +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="src" path="src"/>
+ <classpathentry kind="src" path="gen"/>
<classpathentry kind="output" path="bin/classes"/>
</classpath>
diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/.project b/testapps/jarCheckTests2/app/.project
index f236696..fb6801c 100644
--- a/testapps/jarCheckTests2/basicProjectWithSupport/.project
+++ b/testapps/jarCheckTests2/app/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>test2App</name>
+ <name>jarCheckTests2-app</name>
<comment></comment>
<projects>
</projects>
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/basicProjectWithSupport/project.properties b/testapps/jarCheckTests2/app/project.properties
index cf77006..1d28b51 100644
--- a/testapps/jarCheckTests2/basicProjectWithSupport/project.properties
+++ b/testapps/jarCheckTests2/app/project.properties
@@ -9,5 +9,5 @@
# Project target.
target=android-15
-android.library.reference.1=../basicLibWithSupport
-android.library.reference.2=../basicLibWithSupport2 \ No newline at end of file
+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/basicLibWithSupport/.classpath b/testapps/jarCheckTests2/lib1/.classpath
index c5c5afd..386ce12 100644
--- a/testapps/jarCheckTests2/basicLibWithSupport/.classpath
+++ b/testapps/jarCheckTests2/lib1/.classpath
@@ -1,9 +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="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
index d006198..d006198 100644
--- a/testapps/jarCheckTests2/basicLibWithSupport/libs/android-support-v4.jar
+++ b/testapps/jarCheckTests2/lib1/libs/android-support-v4.jar
Binary files differ
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/basicLibWithSupport2/.classpath b/testapps/jarCheckTests2/lib2/.classpath
index c5c5afd..386ce12 100644
--- a/testapps/jarCheckTests2/basicLibWithSupport2/.classpath
+++ b/testapps/jarCheckTests2/lib2/.classpath
@@ -1,9 +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="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
index 1e90718..1e90718 100644
--- a/testapps/jarCheckTests2/basicLibWithSupport2/libs/android-support-v4.jar
+++ b/testapps/jarCheckTests2/lib2/libs/android-support-v4.jar
Binary files differ
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
generated by cgit v1.1 at 2025-08-22 05:38:41 +0000