aboutsummaryrefslogtreecommitdiff
path: root/testapps/libsAndJarTest
diff options
context:
space:
mode:
Diffstat (limited to 'testapps/libsAndJarTest')
-rw-r--r--testapps/libsAndJarTest/COMPILE_AND_RUN0
-rw-r--r--testapps/libsAndJarTest/SUCCESS0
-rw-r--r--testapps/libsAndJarTest/app/.classpath8
-rw-r--r--testapps/libsAndJarTest/app/.project33
-rw-r--r--testapps/libsAndJarTest/app/AndroidManifest.xml23
-rw-r--r--testapps/libsAndJarTest/app/build.xml90
-rw-r--r--testapps/libsAndJarTest/app/libs/basicJar2.jarbin1803 -> 0 bytes
-rw-r--r--testapps/libsAndJarTest/app/libs/basicJar2.jar.properties1
-rw-r--r--testapps/libsAndJarTest/app/proguard-project.txt22
-rw-r--r--testapps/libsAndJarTest/app/project.properties15
-rw-r--r--testapps/libsAndJarTest/app/res/drawable-hdpi/icon.pngbin4147 -> 0 bytes
-rw-r--r--testapps/libsAndJarTest/app/res/drawable-ldpi/icon.pngbin1723 -> 0 bytes
-rw-r--r--testapps/libsAndJarTest/app/res/drawable-mdpi/icon.pngbin2574 -> 0 bytes
-rw-r--r--testapps/libsAndJarTest/app/res/layout/main.xml43
-rw-r--r--testapps/libsAndJarTest/app/res/values/strings.xml7
-rw-r--r--testapps/libsAndJarTest/app/src/com/android/tests/javaprojecttest/app/App.java33
-rw-r--r--testapps/libsAndJarTest/app/src/com/android/tests/javaprojecttest/app/App.txt1
-rw-r--r--testapps/libsAndJarTest/app/src/com/android/tests/javaprojecttest/app/Main.java34
-rw-r--r--testapps/libsAndJarTest/lib1/.classpath8
-rw-r--r--testapps/libsAndJarTest/lib1/.project33
-rw-r--r--testapps/libsAndJarTest/lib1/AndroidManifest.xml21
-rw-r--r--testapps/libsAndJarTest/lib1/build.xml90
-rw-r--r--testapps/libsAndJarTest/lib1/libs/android-support-v4.jarbin247894 -> 0 bytes
-rw-r--r--testapps/libsAndJarTest/lib1/proguard-project.txt20
-rw-r--r--testapps/libsAndJarTest/lib1/project.properties16
-rw-r--r--testapps/libsAndJarTest/lib1/res/drawable-hdpi/ic_launcher.pngbin4147 -> 0 bytes
-rw-r--r--testapps/libsAndJarTest/lib1/res/drawable-ldpi/ic_launcher.pngbin1723 -> 0 bytes
-rw-r--r--testapps/libsAndJarTest/lib1/res/drawable-mdpi/ic_launcher.pngbin2574 -> 0 bytes
-rw-r--r--testapps/libsAndJarTest/lib1/res/layout/main.xml13
-rw-r--r--testapps/libsAndJarTest/lib1/res/values/strings.xml7
-rw-r--r--testapps/libsAndJarTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java33
-rw-r--r--testapps/libsAndJarTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.txt1
-rw-r--r--testapps/libsAndJarTest/lib1/src/com/android/tests/javaprojecttest/lib1/Main.java20
-rw-r--r--testapps/libsAndJarTest/lib2/.classpath8
-rw-r--r--testapps/libsAndJarTest/lib2/.project33
-rw-r--r--testapps/libsAndJarTest/lib2/AndroidManifest.xml21
-rw-r--r--testapps/libsAndJarTest/lib2/build.xml90
-rw-r--r--testapps/libsAndJarTest/lib2/libs/android-support-v4.jarbin247894 -> 0 bytes
-rw-r--r--testapps/libsAndJarTest/lib2/libs/basicJar.jarbin1791 -> 0 bytes
-rw-r--r--testapps/libsAndJarTest/lib2/libs/basicJar.jar.properties1
-rw-r--r--testapps/libsAndJarTest/lib2/proguard-project.txt20
-rw-r--r--testapps/libsAndJarTest/lib2/project.properties17
-rw-r--r--testapps/libsAndJarTest/lib2/res/drawable-hdpi/ic_launcher.pngbin4147 -> 0 bytes
-rw-r--r--testapps/libsAndJarTest/lib2/res/drawable-ldpi/ic_launcher.pngbin1723 -> 0 bytes
-rw-r--r--testapps/libsAndJarTest/lib2/res/drawable-mdpi/ic_launcher.pngbin2574 -> 0 bytes
-rw-r--r--testapps/libsAndJarTest/lib2/res/layout/main.xml13
-rw-r--r--testapps/libsAndJarTest/lib2/res/values/strings.xml7
-rw-r--r--testapps/libsAndJarTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.java33
-rw-r--r--testapps/libsAndJarTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.txt1
-rw-r--r--testapps/libsAndJarTest/lib2/src/com/android/tests/javaprojecttest/lib2/Main.java15
50 files changed, 0 insertions, 831 deletions
diff --git a/testapps/libsAndJarTest/COMPILE_AND_RUN b/testapps/libsAndJarTest/COMPILE_AND_RUN
deleted file mode 100644
index e69de29bb..000000000
--- a/testapps/libsAndJarTest/COMPILE_AND_RUN
+++ /dev/null
diff --git a/testapps/libsAndJarTest/SUCCESS b/testapps/libsAndJarTest/SUCCESS
deleted file mode 100644
index e69de29bb..000000000
--- a/testapps/libsAndJarTest/SUCCESS
+++ /dev/null
diff --git a/testapps/libsAndJarTest/app/.classpath b/testapps/libsAndJarTest/app/.classpath
deleted file mode 100644
index a4763d1ee..000000000
--- a/testapps/libsAndJarTest/app/.classpath
+++ /dev/null
@@ -1,8 +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="output" path="bin/classes"/>
-</classpath>
diff --git a/testapps/libsAndJarTest/app/.project b/testapps/libsAndJarTest/app/.project
deleted file mode 100644
index dc5f570ea..000000000
--- a/testapps/libsAndJarTest/app/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>libsAndJarTest-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/libsAndJarTest/app/AndroidManifest.xml b/testapps/libsAndJarTest/app/AndroidManifest.xml
deleted file mode 100644
index 36ec8fb11..000000000
--- a/testapps/libsAndJarTest/app/AndroidManifest.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.tests.javaprojecttest.app"
- android:versionCode="1"
- android:versionName="1.0" >
-
- <uses-sdk android:minSdkVersion="15" />
-
- <application
- android:icon="@drawable/icon"
- android:label="@string/app_name" >
- <activity
- android:name="com.android.tests.javaprojecttest.app.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> \ No newline at end of file
diff --git a/testapps/libsAndJarTest/app/build.xml b/testapps/libsAndJarTest/app/build.xml
deleted file mode 100644
index c084512cd..000000000
--- a/testapps/libsAndJarTest/app/build.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="libsAndJarTest-app" 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" />
-
- <!-- if sdk.dir was not set from one of the property file, then
- get it from the ANDROID_HOME env var. -->
- <property environment="env" />
- <condition property="sdk.dir" value="${env.ANDROID_HOME}">
- <isset property="env.ANDROID_HOME" />
- </condition>
-
- <!-- 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 the ANDROID_HOME environment variable."
- 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/libsAndJarTest/app/libs/basicJar2.jar b/testapps/libsAndJarTest/app/libs/basicJar2.jar
deleted file mode 100644
index 5af7cf072..000000000
--- a/testapps/libsAndJarTest/app/libs/basicJar2.jar
+++ /dev/null
Binary files differ
diff --git a/testapps/libsAndJarTest/app/libs/basicJar2.jar.properties b/testapps/libsAndJarTest/app/libs/basicJar2.jar.properties
deleted file mode 100644
index d8099d281..000000000
--- a/testapps/libsAndJarTest/app/libs/basicJar2.jar.properties
+++ /dev/null
@@ -1 +0,0 @@
-src=../../../basicJar2/src/ \ No newline at end of file
diff --git a/testapps/libsAndJarTest/app/proguard-project.txt b/testapps/libsAndJarTest/app/proguard-project.txt
deleted file mode 100644
index 349f80f9c..000000000
--- a/testapps/libsAndJarTest/app/proguard-project.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
--adaptclassstrings \ No newline at end of file
diff --git a/testapps/libsAndJarTest/app/project.properties b/testapps/libsAndJarTest/app/project.properties
deleted file mode 100644
index 9df42215a..000000000
--- a/testapps/libsAndJarTest/app/project.properties
+++ /dev/null
@@ -1,15 +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 edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# Project target.
-target=android-15
-android.library.reference.1=../lib1
-
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
diff --git a/testapps/libsAndJarTest/app/res/drawable-hdpi/icon.png b/testapps/libsAndJarTest/app/res/drawable-hdpi/icon.png
deleted file mode 100644
index 8074c4c57..000000000
--- a/testapps/libsAndJarTest/app/res/drawable-hdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/testapps/libsAndJarTest/app/res/drawable-ldpi/icon.png b/testapps/libsAndJarTest/app/res/drawable-ldpi/icon.png
deleted file mode 100644
index 1095584ec..000000000
--- a/testapps/libsAndJarTest/app/res/drawable-ldpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/testapps/libsAndJarTest/app/res/drawable-mdpi/icon.png b/testapps/libsAndJarTest/app/res/drawable-mdpi/icon.png
deleted file mode 100644
index a07c69fa5..000000000
--- a/testapps/libsAndJarTest/app/res/drawable-mdpi/icon.png
+++ /dev/null
Binary files differ
diff --git a/testapps/libsAndJarTest/app/res/layout/main.xml b/testapps/libsAndJarTest/app/res/layout/main.xml
deleted file mode 100644
index 16df43ce1..000000000
--- a/testapps/libsAndJarTest/app/res/layout/main.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- 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/basicJar"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:text="\\?"
- tools:ignore="HardcodedText" />
-
- <TextView
- android:id="@+id/basicJar2"
- 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/libsAndJarTest/app/res/values/strings.xml b/testapps/libsAndJarTest/app/res/values/strings.xml
deleted file mode 100644
index 6dc9f4725..000000000
--- a/testapps/libsAndJarTest/app/res/values/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <string name="app_name">libsAndJarTest-app</string>
- <string name="main">foo</string>
-
-</resources> \ No newline at end of file
diff --git a/testapps/libsAndJarTest/app/src/com/android/tests/javaprojecttest/app/App.java b/testapps/libsAndJarTest/app/src/com/android/tests/javaprojecttest/app/App.java
deleted file mode 100644
index aa5d1571f..000000000
--- a/testapps/libsAndJarTest/app/src/com/android/tests/javaprojecttest/app/App.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.android.tests.javaprojecttest.app;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-
-public class App {
-
- public static String getContent() {
- InputStream input = App.class.getResourceAsStream("App.txt");
- if (input == null) {
- return "FAILED TO FIND App.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/libsAndJarTest/app/src/com/android/tests/javaprojecttest/app/App.txt b/testapps/libsAndJarTest/app/src/com/android/tests/javaprojecttest/app/App.txt
deleted file mode 100644
index d488bc465..000000000
--- a/testapps/libsAndJarTest/app/src/com/android/tests/javaprojecttest/app/App.txt
+++ /dev/null
@@ -1 +0,0 @@
-SUCCESS from App \ No newline at end of file
diff --git a/testapps/libsAndJarTest/app/src/com/android/tests/javaprojecttest/app/Main.java b/testapps/libsAndJarTest/app/src/com/android/tests/javaprojecttest/app/Main.java
deleted file mode 100644
index 95dd00c3e..000000000
--- a/testapps/libsAndJarTest/app/src/com/android/tests/javaprojecttest/app/Main.java
+++ /dev/null
@@ -1,34 +0,0 @@
-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.basicjar2.BasicJar2;
-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: " + App.getContent());
-
- 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.basicJar);
- tv.setText("BasicJar: " + BasicJar.getContent());
-
- tv = (TextView) findViewById(R.id.basicJar2);
- tv.setText("BasicJar2: " + BasicJar2.getContent());
- }
-} \ No newline at end of file
diff --git a/testapps/libsAndJarTest/lib1/.classpath b/testapps/libsAndJarTest/lib1/.classpath
deleted file mode 100644
index a4763d1ee..000000000
--- a/testapps/libsAndJarTest/lib1/.classpath
+++ /dev/null
@@ -1,8 +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="output" path="bin/classes"/>
-</classpath>
diff --git a/testapps/libsAndJarTest/lib1/.project b/testapps/libsAndJarTest/lib1/.project
deleted file mode 100644
index 616ff1fc9..000000000
--- a/testapps/libsAndJarTest/lib1/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>libsAndJarTest-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/libsAndJarTest/lib1/AndroidManifest.xml b/testapps/libsAndJarTest/lib1/AndroidManifest.xml
deleted file mode 100644
index c51696be6..000000000
--- a/testapps/libsAndJarTest/lib1/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- 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> \ No newline at end of file
diff --git a/testapps/libsAndJarTest/lib1/build.xml b/testapps/libsAndJarTest/lib1/build.xml
deleted file mode 100644
index ed2552189..000000000
--- a/testapps/libsAndJarTest/lib1/build.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="libsAndJarTest-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" />
-
- <!-- if sdk.dir was not set from one of the property file, then
- get it from the ANDROID_HOME env var. -->
- <property environment="env" />
- <condition property="sdk.dir" value="${env.ANDROID_HOME}">
- <isset property="env.ANDROID_HOME" />
- </condition>
-
- <!-- 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 the ANDROID_HOME environment variable."
- 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/libsAndJarTest/lib1/libs/android-support-v4.jar b/testapps/libsAndJarTest/lib1/libs/android-support-v4.jar
deleted file mode 100644
index d006198e6..000000000
--- a/testapps/libsAndJarTest/lib1/libs/android-support-v4.jar
+++ /dev/null
Binary files differ
diff --git a/testapps/libsAndJarTest/lib1/proguard-project.txt b/testapps/libsAndJarTest/lib1/proguard-project.txt
deleted file mode 100644
index f2fe1559a..000000000
--- a/testapps/libsAndJarTest/lib1/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/testapps/libsAndJarTest/lib1/project.properties b/testapps/libsAndJarTest/lib1/project.properties
deleted file mode 100644
index 480c5b62a..000000000
--- a/testapps/libsAndJarTest/lib1/project.properties
+++ /dev/null
@@ -1,16 +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 edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-15
-android.library=true
-android.library.reference.1=../lib2
diff --git a/testapps/libsAndJarTest/lib1/res/drawable-hdpi/ic_launcher.png b/testapps/libsAndJarTest/lib1/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 8074c4c57..000000000
--- a/testapps/libsAndJarTest/lib1/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/testapps/libsAndJarTest/lib1/res/drawable-ldpi/ic_launcher.png b/testapps/libsAndJarTest/lib1/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 1095584ec..000000000
--- a/testapps/libsAndJarTest/lib1/res/drawable-ldpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/testapps/libsAndJarTest/lib1/res/drawable-mdpi/ic_launcher.png b/testapps/libsAndJarTest/lib1/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index a07c69fa5..000000000
--- a/testapps/libsAndJarTest/lib1/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/testapps/libsAndJarTest/lib1/res/layout/main.xml b/testapps/libsAndJarTest/lib1/res/layout/main.xml
deleted file mode 100644
index b79cddb17..000000000
--- a/testapps/libsAndJarTest/lib1/res/layout/main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="Hello World, Main"
- />
-</LinearLayout>
-
diff --git a/testapps/libsAndJarTest/lib1/res/values/strings.xml b/testapps/libsAndJarTest/lib1/res/values/strings.xml
deleted file mode 100644
index 1993ff60d..000000000
--- a/testapps/libsAndJarTest/lib1/res/values/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <string name="app_name">Main</string>
- <string name="foo1">foo</string>
-
-</resources> \ No newline at end of file
diff --git a/testapps/libsAndJarTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java b/testapps/libsAndJarTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java
deleted file mode 100644
index fe4a2a12b..000000000
--- a/testapps/libsAndJarTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java
+++ /dev/null
@@ -1,33 +0,0 @@
-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");
- if (input == null) {
- return "FAILED TO FIND 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/libsAndJarTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.txt b/testapps/libsAndJarTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.txt
deleted file mode 100644
index b3e210d04..000000000
--- a/testapps/libsAndJarTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.txt
+++ /dev/null
@@ -1 +0,0 @@
-SUCCESS from Lib1 \ No newline at end of file
diff --git a/testapps/libsAndJarTest/lib1/src/com/android/tests/javaprojecttest/lib1/Main.java b/testapps/libsAndJarTest/lib1/src/com/android/tests/javaprojecttest/lib1/Main.java
deleted file mode 100644
index 1c3ed355d..000000000
--- a/testapps/libsAndJarTest/lib1/src/com/android/tests/javaprojecttest/lib1/Main.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package com.android.tests.javaprojecttest.lib1;
-
-import android.app.Activity;
-import android.os.Bundle;
-
-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);
-
- //Access some class from Lib2 to make sure we can access them.
- String foo = Lib2.getContent();
- }
-}
diff --git a/testapps/libsAndJarTest/lib2/.classpath b/testapps/libsAndJarTest/lib2/.classpath
deleted file mode 100644
index a4763d1ee..000000000
--- a/testapps/libsAndJarTest/lib2/.classpath
+++ /dev/null
@@ -1,8 +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="output" path="bin/classes"/>
-</classpath>
diff --git a/testapps/libsAndJarTest/lib2/.project b/testapps/libsAndJarTest/lib2/.project
deleted file mode 100644
index 3f2ef161f..000000000
--- a/testapps/libsAndJarTest/lib2/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>libsAndJarTest-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/libsAndJarTest/lib2/AndroidManifest.xml b/testapps/libsAndJarTest/lib2/AndroidManifest.xml
deleted file mode 100644
index 10d4a001b..000000000
--- a/testapps/libsAndJarTest/lib2/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- 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> \ No newline at end of file
diff --git a/testapps/libsAndJarTest/lib2/build.xml b/testapps/libsAndJarTest/lib2/build.xml
deleted file mode 100644
index 4f351c875..000000000
--- a/testapps/libsAndJarTest/lib2/build.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="libsAndJarTest-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" />
-
- <!-- if sdk.dir was not set from one of the property file, then
- get it from the ANDROID_HOME env var. -->
- <property environment="env" />
- <condition property="sdk.dir" value="${env.ANDROID_HOME}">
- <isset property="env.ANDROID_HOME" />
- </condition>
-
- <!-- 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 the ANDROID_HOME environment variable."
- 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/libsAndJarTest/lib2/libs/android-support-v4.jar b/testapps/libsAndJarTest/lib2/libs/android-support-v4.jar
deleted file mode 100644
index d006198e6..000000000
--- a/testapps/libsAndJarTest/lib2/libs/android-support-v4.jar
+++ /dev/null
Binary files differ
diff --git a/testapps/libsAndJarTest/lib2/libs/basicJar.jar b/testapps/libsAndJarTest/lib2/libs/basicJar.jar
deleted file mode 100644
index 319ed0245..000000000
--- a/testapps/libsAndJarTest/lib2/libs/basicJar.jar
+++ /dev/null
Binary files differ
diff --git a/testapps/libsAndJarTest/lib2/libs/basicJar.jar.properties b/testapps/libsAndJarTest/lib2/libs/basicJar.jar.properties
deleted file mode 100644
index c6b82fb45..000000000
--- a/testapps/libsAndJarTest/lib2/libs/basicJar.jar.properties
+++ /dev/null
@@ -1 +0,0 @@
-src=../../../basicJar/src/ \ No newline at end of file
diff --git a/testapps/libsAndJarTest/lib2/proguard-project.txt b/testapps/libsAndJarTest/lib2/proguard-project.txt
deleted file mode 100644
index f2fe1559a..000000000
--- a/testapps/libsAndJarTest/lib2/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
diff --git a/testapps/libsAndJarTest/lib2/project.properties b/testapps/libsAndJarTest/lib2/project.properties
deleted file mode 100644
index 9be883066..000000000
--- a/testapps/libsAndJarTest/lib2/project.properties
+++ /dev/null
@@ -1,17 +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 edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-15
-android.library=true
-verbose=true
-
diff --git a/testapps/libsAndJarTest/lib2/res/drawable-hdpi/ic_launcher.png b/testapps/libsAndJarTest/lib2/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 8074c4c57..000000000
--- a/testapps/libsAndJarTest/lib2/res/drawable-hdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/testapps/libsAndJarTest/lib2/res/drawable-ldpi/ic_launcher.png b/testapps/libsAndJarTest/lib2/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 1095584ec..000000000
--- a/testapps/libsAndJarTest/lib2/res/drawable-ldpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/testapps/libsAndJarTest/lib2/res/drawable-mdpi/ic_launcher.png b/testapps/libsAndJarTest/lib2/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index a07c69fa5..000000000
--- a/testapps/libsAndJarTest/lib2/res/drawable-mdpi/ic_launcher.png
+++ /dev/null
Binary files differ
diff --git a/testapps/libsAndJarTest/lib2/res/layout/main.xml b/testapps/libsAndJarTest/lib2/res/layout/main.xml
deleted file mode 100644
index b79cddb17..000000000
--- a/testapps/libsAndJarTest/lib2/res/layout/main.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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="Hello World, Main"
- />
-</LinearLayout>
-
diff --git a/testapps/libsAndJarTest/lib2/res/values/strings.xml b/testapps/libsAndJarTest/lib2/res/values/strings.xml
deleted file mode 100644
index e1e7a9dd4..000000000
--- a/testapps/libsAndJarTest/lib2/res/values/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
- <string name="app_name">Main</string>
- <string name="foo2">foo</string>
-
-</resources> \ No newline at end of file
diff --git a/testapps/libsAndJarTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.java b/testapps/libsAndJarTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.java
deleted file mode 100644
index 5831cb2d1..000000000
--- a/testapps/libsAndJarTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.java
+++ /dev/null
@@ -1,33 +0,0 @@
-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");
- if (input == null) {
- return "FAILED TO FIND 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/libsAndJarTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.txt b/testapps/libsAndJarTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.txt
deleted file mode 100644
index 3ba8e357a..000000000
--- a/testapps/libsAndJarTest/lib2/src/com/android/tests/javaprojecttest/lib2/Lib2.txt
+++ /dev/null
@@ -1 +0,0 @@
-SUCCESS from Lib2 \ No newline at end of file
diff --git a/testapps/libsAndJarTest/lib2/src/com/android/tests/javaprojecttest/lib2/Main.java b/testapps/libsAndJarTest/lib2/src/com/android/tests/javaprojecttest/lib2/Main.java
deleted file mode 100644
index 14598969a..000000000
--- a/testapps/libsAndJarTest/lib2/src/com/android/tests/javaprojecttest/lib2/Main.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package com.android.tests.javaprojecttest.lib2;
-
-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.main);
- }
-}