Add a new test app with indirect lib.

Change-Id: I9946ade7950741faad6f76aeb84e8d6bd05a5455
author: Xavier Ducrohet <xav@android.com> 2012-02-27 17:21:38 -0800
committer: Xavier Ducrohet <xav@android.com> 2012-02-27 17:21:38 -0800
commit: 0a5104e923c10167af41c5f2b644a49116294cea (patch)
tree: 7a169491182fab5d611cca8a1e656e7ca2b33eab /testapps
parent: ee01dd0e2dfc082fbe4c5f73d0ea27df49e217a9 (diff)
download: sdk-0a5104e923c10167af41c5f2b644a49116294cea.zip
sdk-0a5104e923c10167af41c5f2b644a49116294cea.tar.gz
sdk-0a5104e923c10167af41c5f2b644a49116294cea.tar.bz2
27 files changed, 362 insertions, 0 deletions
diff --git a/testapps/libWithLibTest/basicLib/.classpath b/testapps/libWithLibTest/basicLib/.classpath
new file mode 100644
index 0000000..765e549
--- /dev/null
+++ b/testapps/libWithLibTest/basicLib/.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"/>
+</classpath>
diff --git a/testapps/libWithLibTest/basicLib/.project b/testapps/libWithLibTest/basicLib/.project
new file mode 100644
index 0000000..5c71aaf
--- /dev/null
+++ b/testapps/libWithLibTest/basicLib/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>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/basicLib/AndroidManifest.xml b/testapps/libWithLibTest/basicLib/AndroidManifest.xml
new file mode 100644
index 0000000..aaf0fff
--- /dev/null
+++ b/testapps/libWithLibTest/basicLib/AndroidManifest.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.android.tests.basiclib"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application android:icon="@drawable/icon" android:label="@string/basicLib_name">
+        <activity android:name="Main"
+                  android:label="@string/basicLib_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+    <uses-sdk android:minSdkVersion="15" />
+</manifest>
diff --git a/testapps/libWithLibTest/basicLib/build.properties b/testapps/libWithLibTest/basicLib/build.properties
new file mode 100644
index 0000000..ee52d86
--- /dev/null
+++ b/testapps/libWithLibTest/basicLib/build.properties
@@ -0,0 +1,17 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in 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/basicLib/project.properties b/testapps/libWithLibTest/basicLib/project.properties
new file mode 100644
index 0000000..0a26b19
--- /dev/null
+++ b/testapps/libWithLibTest/basicLib/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,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-15
+android.library=true
+android.library.reference.1=../basicLibWithJar
diff --git a/testapps/libWithLibTest/basicLib/res/drawable/icon.png b/testapps/libWithLibTest/basicLib/res/drawable/icon.png
new file mode 100644
index 0000000..a07c69f
--- /dev/null
+++ b/testapps/libWithLibTest/basicLib/res/drawable/icon.png
diff --git a/testapps/libWithLibTest/basicLib/res/layout/basiclib_main.xml b/testapps/libWithLibTest/basicLib/res/layout/basiclib_main.xml
new file mode 100644
index 0000000..37e5c2c
--- /dev/null
+++ b/testapps/libWithLibTest/basicLib/res/layout/basiclib_main.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:text="basicLib Layout"
+    />
+</LinearLayout>
+
diff --git a/testapps/libWithLibTest/basicLib/res/values/strings.xml b/testapps/libWithLibTest/basicLib/res/values/strings.xml
new file mode 100644
index 0000000..1bdf988
--- /dev/null
+++ b/testapps/libWithLibTest/basicLib/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="basicLib_name">basicLib</string>
+</resources>
diff --git a/testapps/libWithLibTest/basicLib/src/com/android/tests/basiclib/Main.java b/testapps/libWithLibTest/basicLib/src/com/android/tests/basiclib/Main.java
new file mode 100644
index 0000000..0be5f11
--- /dev/null
+++ b/testapps/libWithLibTest/basicLib/src/com/android/tests/basiclib/Main.java
@@ -0,0 +1,15 @@
+package com.android.tests.basiclib;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class Main extends Activity
+{
+    /** Called when the activity is first created. */
+    @Override
+    public void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.basiclib_main);
+    }
+}
diff --git a/testapps/libWithLibTest/basicLibWithJar/.classpath b/testapps/libWithLibTest/basicLibWithJar/.classpath
new file mode 100644
index 0000000..08a60d4
--- /dev/null
+++ b/testapps/libWithLibTest/basicLibWithJar/.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/basicJar.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/testapps/libWithLibTest/basicLibWithJar/.project b/testapps/libWithLibTest/basicLibWithJar/.project
new file mode 100644
index 0000000..5bbb0f6
--- /dev/null
+++ b/testapps/libWithLibTest/basicLibWithJar/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>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/AndroidManifest.xml b/testapps/libWithLibTest/basicLibWithJar/AndroidManifest.xml
new file mode 100644
index 0000000..1363206
--- /dev/null
+++ b/testapps/libWithLibTest/basicLibWithJar/AndroidManifest.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.android.tests.basiclibwithjar"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application android:icon="@drawable/icon" android:label="@string/basicLibWithJar_name">
+        <activity android:name="Main" android:label="@string/basicLibWithJar_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+    <uses-sdk android:minSdkVersion="15" />
+</manifest>
diff --git a/testapps/libWithLibTest/basicLibWithJar/build.properties b/testapps/libWithLibTest/basicLibWithJar/build.properties
new file mode 100644
index 0000000..ee52d86
--- /dev/null
+++ b/testapps/libWithLibTest/basicLibWithJar/build.properties
@@ -0,0 +1,17 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in 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/basicLibWithJar/libs/basicJar.jar b/testapps/libWithLibTest/basicLibWithJar/libs/basicJar.jar
new file mode 100644
index 0000000..8169064
--- /dev/null
+++ b/testapps/libWithLibTest/basicLibWithJar/libs/basicJar.jar
diff --git a/testapps/libWithLibTest/basicLibWithJar/project.properties b/testapps/libWithLibTest/basicLibWithJar/project.properties
new file mode 100644
index 0000000..7414a68
--- /dev/null
+++ b/testapps/libWithLibTest/basicLibWithJar/project.properties
@@ -0,0 +1,12 @@
+# 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,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-15
+android.library=true
diff --git a/testapps/libWithLibTest/basicLibWithJar/res/drawable/icon.png b/testapps/libWithLibTest/basicLibWithJar/res/drawable/icon.png
new file mode 100644
index 0000000..a07c69f
--- /dev/null
+++ b/testapps/libWithLibTest/basicLibWithJar/res/drawable/icon.png
diff --git a/testapps/libWithLibTest/basicLibWithJar/res/layout/basiclibwithjar_main.xml b/testapps/libWithLibTest/basicLibWithJar/res/layout/basiclibwithjar_main.xml
new file mode 100644
index 0000000..5fefdd7
--- /dev/null
+++ b/testapps/libWithLibTest/basicLibWithJar/res/layout/basiclibwithjar_main.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:text="basicLibWithJar"
+    android:id="@+id/text"
+    />
+</LinearLayout>
+
diff --git a/testapps/libWithLibTest/basicLibWithJar/res/layout/main.xml b/testapps/libWithLibTest/basicLibWithJar/res/layout/main.xml
new file mode 100644
index 0000000..fc39355
--- /dev/null
+++ b/testapps/libWithLibTest/basicLibWithJar/res/layout/main.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    >
+<TextView
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content"
+    android:text="basicLibWithJar"
+    android:id="@id/text"
+    />
+</LinearLayout>
+
diff --git a/testapps/libWithLibTest/basicLibWithJar/res/values/ids.xml b/testapps/libWithLibTest/basicLibWithJar/res/values/ids.xml
new file mode 100644
index 0000000..8cbe2cc
--- /dev/null
+++ b/testapps/libWithLibTest/basicLibWithJar/res/values/ids.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="text" type="id"/>
+</resources>
diff --git a/testapps/libWithLibTest/basicLibWithJar/res/values/strings.xml b/testapps/libWithLibTest/basicLibWithJar/res/values/strings.xml
new file mode 100644
index 0000000..1701887
--- /dev/null
+++ b/testapps/libWithLibTest/basicLibWithJar/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="basicLibWithJar_name">basicLibWithJar</string>
+</resources>
diff --git a/testapps/libWithLibTest/basicLibWithJar/src/com/android/tests/basiclibwithjar/Main.java b/testapps/libWithLibTest/basicLibWithJar/src/com/android/tests/basiclibwithjar/Main.java
new file mode 100644
index 0000000..a7b782a
--- /dev/null
+++ b/testapps/libWithLibTest/basicLibWithJar/src/com/android/tests/basiclibwithjar/Main.java
@@ -0,0 +1,25 @@
+package com.android.tests.basiclibwithjar;
+
+import com.android.tests.basicjar.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.basiclibwithjar_main);
+
+        Foo foo = new Foo();
+        int a = foo.getRandomFoo();
+
+        TextView tv = (TextView) findViewById(R.id.text);
+        tv.setText("BasicLibWithJar: Value from Jar: " + a);
+
+    }
+}
diff --git a/testapps/libWithLibTest/basicProjectWithLib/.classpath b/testapps/libWithLibTest/basicProjectWithLib/.classpath
new file mode 100644
index 0000000..29e2115
--- /dev/null
+++ b/testapps/libWithLibTest/basicProjectWithLib/.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="/basicLibWithJar/libs/basicJar.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
diff --git a/testapps/libWithLibTest/basicProjectWithLib/.project b/testapps/libWithLibTest/basicProjectWithLib/.project
new file mode 100644
index 0000000..4b74bbd
--- /dev/null
+++ b/testapps/libWithLibTest/basicProjectWithLib/.project
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>basicProjectWithLib</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/basicProjectWithLib/AndroidManifest.xml b/testapps/libWithLibTest/basicProjectWithLib/AndroidManifest.xml
new file mode 100644
index 0000000..4870542
--- /dev/null
+++ b/testapps/libWithLibTest/basicProjectWithLib/AndroidManifest.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+      package="com.android.tests.basicprojectwithlib"
+      android:versionCode="1"
+      android:versionName="1.0">
+    <application android:icon="@drawable/icon" android:label="@string/full_app_name">
+        <activity android:name="com.android.tests.basiclib.Main" android:label="@string/basicLib_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.android.tests.basiclibwithjar.Main" android:label="@string/basicLibWithJar_name">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+    </application>
+    <uses-sdk android:minSdkVersion="15" />
+</manifest>
diff --git a/testapps/libWithLibTest/basicProjectWithLib/build.properties b/testapps/libWithLibTest/basicProjectWithLib/build.properties
new file mode 100644
index 0000000..ee52d86
--- /dev/null
+++ b/testapps/libWithLibTest/basicProjectWithLib/build.properties
@@ -0,0 +1,17 @@
+# This file is used to override default values used by the Ant build system.
+#
+# This file must be checked in 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/project.properties b/testapps/libWithLibTest/basicProjectWithLib/project.properties
new file mode 100644
index 0000000..a418b0a
--- /dev/null
+++ b/testapps/libWithLibTest/basicProjectWithLib/project.properties
@@ -0,0 +1,12 @@
+# 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,
+# "build.properties", and override values to adapt the script to your
+# project structure.
+
+# Project target.
+target=android-15
+android.library.reference.1=../basicLib
diff --git a/testapps/libWithLibTest/basicProjectWithLib/res/values/strings.xml b/testapps/libWithLibTest/basicProjectWithLib/res/values/strings.xml
new file mode 100644
index 0000000..bdca683
--- /dev/null
+++ b/testapps/libWithLibTest/basicProjectWithLib/res/values/strings.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="full_app_name">basicProjectWithLib</string>
+</resources>
author	Xavier Ducrohet <xav@android.com>	2012-02-27 17:21:38 -0800
committer	Xavier Ducrohet <xav@android.com>	2012-02-27 17:21:38 -0800
commit	0a5104e923c10167af41c5f2b644a49116294cea (patch)
tree	7a169491182fab5d611cca8a1e656e7ca2b33eab /testapps
parent	ee01dd0e2dfc082fbe4c5f73d0ea27df49e217a9 (diff)
download	sdk-0a5104e923c10167af41c5f2b644a49116294cea.zip sdk-0a5104e923c10167af41c5f2b644a49116294cea.tar.gz sdk-0a5104e923c10167af41c5f2b644a49116294cea.tar.bz2