aboutsummaryrefslogtreecommitdiffstats
path: root/testapps/libWithLibTest
diff options
context:
space:
mode:
Diffstat (limited to 'testapps/libWithLibTest')
-rw-r--r--testapps/libWithLibTest/.DS_Storebin0 -> 6148 bytes
-rw-r--r--testapps/libWithLibTest/app/.classpath (renamed from testapps/libWithLibTest/basicLib/.classpath)0
-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/libWithLibTest/basicLib/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/lib1/.classpath (renamed from testapps/libWithLibTest/basicProjectWithLib/.classpath)1
-rw-r--r--testapps/libWithLibTest/lib1/.project (renamed from testapps/libWithLibTest/basicLib/.project)2
-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/libWithLibTest/basicLibWithJar/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)bin2574 -> 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 (renamed from testapps/libWithLibTest/basicLibWithJar/.project)2
-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/basicProjectWithLib/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)bin2713 -> 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)bin2574 -> 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
34 files changed, 4 insertions, 5 deletions
diff --git a/testapps/libWithLibTest/.DS_Store b/testapps/libWithLibTest/.DS_Store
new file mode 100644
index 0000000..8d9d631
--- /dev/null
+++ b/testapps/libWithLibTest/.DS_Store
Binary files differ
diff --git a/testapps/libWithLibTest/basicLib/.classpath b/testapps/libWithLibTest/app/.classpath
index a4763d1..a4763d1 100644
--- a/testapps/libWithLibTest/basicLib/.classpath
+++ b/testapps/libWithLibTest/app/.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/libWithLibTest/basicLib/ant.properties b/testapps/libWithLibTest/app/ant.properties
index b0971e8..b0971e8 100644
--- a/testapps/libWithLibTest/basicLib/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/basicProjectWithLib/.classpath b/testapps/libWithLibTest/lib1/.classpath
index abb4b65..a4763d1 100644
--- a/testapps/libWithLibTest/basicProjectWithLib/.classpath
+++ b/testapps/libWithLibTest/lib1/.classpath
@@ -4,6 +4,5 @@
<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/basicLib/.project b/testapps/libWithLibTest/lib1/.project
index dbf57b4..d256174 100644
--- a/testapps/libWithLibTest/basicLib/.project
+++ b/testapps/libWithLibTest/lib1/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>libWithLibTest-basicLib</name>
+ <name>libWithLibTest-lib1</name>
<comment></comment>
<projects>
</projects>
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/libWithLibTest/basicLibWithJar/ant.properties b/testapps/libWithLibTest/lib1/ant.properties
index b0971e8..b0971e8 100644
--- a/testapps/libWithLibTest/basicLibWithJar/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
index a07c69f..a07c69f 100644
--- a/testapps/libWithLibTest/basicLib/res/drawable/icon.png
+++ b/testapps/libWithLibTest/lib1/res/drawable/icon.png
Binary files differ
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/basicLibWithJar/.project b/testapps/libWithLibTest/lib2/.project
index ef8773c..5f68270 100644
--- a/testapps/libWithLibTest/basicLibWithJar/.project
+++ b/testapps/libWithLibTest/lib2/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>libWithLibTest-basicLibWithJar</name>
+ <name>libWithLibTest-lib2</name>
<comment></comment>
<projects>
</projects>
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/basicProjectWithLib/ant.properties b/testapps/libWithLibTest/lib2/ant.properties
index b0971e8..b0971e8 100644
--- a/testapps/libWithLibTest/basicProjectWithLib/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
index 8169064..8169064 100644
--- a/testapps/libWithLibTest/basicLibWithJar/libs/basicJar.jar
+++ b/testapps/libWithLibTest/lib2/libs/basicJar.jar
Binary files differ
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
index a07c69f..a07c69f 100644
--- a/testapps/libWithLibTest/basicLibWithJar/res/drawable/icon.png
+++ b/testapps/libWithLibTest/lib2/res/drawable/icon.png
Binary files differ
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
generated by cgit v1.1 at 2025-08-22 18:21:58 +0000