diff options
Diffstat (limited to 'testapps/javaProjectTest/lib1')
| -rw-r--r-- | testapps/javaProjectTest/lib1/.classpath | 2 | ||||
| -rw-r--r-- | testapps/javaProjectTest/lib1/.project | 2 | ||||
| -rw-r--r-- | testapps/javaProjectTest/lib1/AndroidManifest.xml | 20 | ||||
| -rw-r--r-- | testapps/javaProjectTest/lib1/ant.properties | 17 | ||||
| -rw-r--r-- | testapps/javaProjectTest/lib1/build.xml | 83 | ||||
| -rw-r--r-- | testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java | 30 | ||||
| -rw-r--r-- | testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.txt | 1 | ||||
| -rw-r--r-- | testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Main.java (renamed from testapps/javaProjectTest/lib1/src/com/android/test/lib1/Main.java) | 2 |
8 files changed, 47 insertions, 110 deletions
diff --git a/testapps/javaProjectTest/lib1/.classpath b/testapps/javaProjectTest/lib1/.classpath index 71cf1b1..8917f25 100644 --- a/testapps/javaProjectTest/lib1/.classpath +++ b/testapps/javaProjectTest/lib1/.classpath @@ -4,7 +4,7 @@ <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 combineaccessrules="false" kind="src" path="/javaProject"/> + <classpathentry combineaccessrules="false" kind="src" path="/javaProjectTest-javaProject"/> <classpathentry kind="lib" path="libs/android-support-v4.jar"/> <classpathentry kind="output" path="bin/classes"/> </classpath> diff --git a/testapps/javaProjectTest/lib1/.project b/testapps/javaProjectTest/lib1/.project index 596b85d..cac8ac1 100644 --- a/testapps/javaProjectTest/lib1/.project +++ b/testapps/javaProjectTest/lib1/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>Lib1</name> + <name>javaProjectTest-Lib1</name> <comment></comment> <projects> </projects> diff --git a/testapps/javaProjectTest/lib1/AndroidManifest.xml b/testapps/javaProjectTest/lib1/AndroidManifest.xml index 196db0b..c51696b 100644 --- a/testapps/javaProjectTest/lib1/AndroidManifest.xml +++ b/testapps/javaProjectTest/lib1/AndroidManifest.xml @@ -1,15 +1,21 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="com.android.test.lib1" - android:versionCode="1" - android:versionName="1.0"> - <application android:label="@string/app_name" android:icon="@drawable/ic_launcher"> - <activity android:name="Main" - android:label="@string/app_name"> + 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> + +</manifest>
\ No newline at end of file diff --git a/testapps/javaProjectTest/lib1/ant.properties b/testapps/javaProjectTest/lib1/ant.properties deleted file mode 100644 index b0971e8..0000000 --- a/testapps/javaProjectTest/lib1/ant.properties +++ /dev/null @@ -1,17 +0,0 @@ -# This file is used to override default values used by the Ant build system. -# -# This file must be checked into 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/javaProjectTest/lib1/build.xml b/testapps/javaProjectTest/lib1/build.xml deleted file mode 100644 index 2a15ae6..0000000 --- a/testapps/javaProjectTest/lib1/build.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project name="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" /> - - <!-- 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 an env var" - 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/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java b/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java new file mode 100644 index 0000000..b1e7702 --- /dev/null +++ b/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.java @@ -0,0 +1,30 @@ +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"); + + 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/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.txt b/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.txt new file mode 100644 index 0000000..b3e210d --- /dev/null +++ b/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Lib1.txt @@ -0,0 +1 @@ +SUCCESS from Lib1
\ No newline at end of file diff --git a/testapps/javaProjectTest/lib1/src/com/android/test/lib1/Main.java b/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Main.java index 116f14a..f09e1cd 100644 --- a/testapps/javaProjectTest/lib1/src/com/android/test/lib1/Main.java +++ b/testapps/javaProjectTest/lib1/src/com/android/tests/javaprojecttest/lib1/Main.java @@ -1,4 +1,4 @@ -package com.android.test.lib1; +package com.android.tests.javaprojecttest.lib1; import android.app.Activity; import android.os.Bundle; |