From 6c4f5c561d662456f55830a554c51c3d9670d094 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Wed, 29 Feb 2012 15:54:36 -0800 Subject: Move Android project with Java project dep test to its own folder. Also make it more complex: - java project references a jar file. - 2 libs depend on the java project - app project only reference the libs, not the java project (it still does but indirectly). Change-Id: I8fc53e0f868ce014ea99486e7b1fa6fe0f197daa --- testapps/basicJavaProject/.classpath | 6 -- testapps/basicJavaProject/.project | 17 ----- .../com/android/tests/basicJavaProject/Foo.java | 16 ---- testapps/basicProjectWithJava/.classpath | 9 --- testapps/basicProjectWithJava/.project | 33 -------- testapps/basicProjectWithJava/AndroidManifest.xml | 16 ---- testapps/basicProjectWithJava/default.properties | 11 --- .../res/drawable-hdpi/icon.png | Bin 4147 -> 0 bytes .../res/drawable-ldpi/icon.png | Bin 1723 -> 0 bytes .../res/drawable-mdpi/icon.png | Bin 2574 -> 0 bytes testapps/basicProjectWithJava/res/layout/main.xml | 18 ----- .../basicProjectWithJava/res/values/strings.xml | 4 - .../android/tests/basicProjectWithJava/Main.java | 22 ------ .../tests/basicProjectWithJava/MyTextView.java | 27 ------- testapps/javaProjectTest/app/.classpath | 8 ++ testapps/javaProjectTest/app/.project | 33 ++++++++ testapps/javaProjectTest/app/AndroidManifest.xml | 23 ++++++ testapps/javaProjectTest/app/project.properties | 16 ++++ .../javaProjectTest/app/res/drawable-hdpi/icon.png | Bin 0 -> 4147 bytes .../javaProjectTest/app/res/drawable-ldpi/icon.png | Bin 0 -> 1723 bytes .../javaProjectTest/app/res/drawable-mdpi/icon.png | Bin 0 -> 2574 bytes testapps/javaProjectTest/app/res/layout/main.xml | 18 +++++ .../javaProjectTest/app/res/values/strings.xml | 4 + .../android/tests/basicProjectWithJava/Main.java | 22 ++++++ .../tests/basicProjectWithJava/MyTextView.java | 27 +++++++ testapps/javaProjectTest/javaProject/.classpath | 7 ++ testapps/javaProjectTest/javaProject/.project | 17 +++++ .../javaProjectTest/javaProject/libs/basicJar.jar | Bin 0 -> 2713 bytes .../com/android/tests/basicJavaProject/Foo.java | 16 ++++ testapps/javaProjectTest/lib1/.classpath | 10 +++ testapps/javaProjectTest/lib1/.project | 33 ++++++++ testapps/javaProjectTest/lib1/AndroidManifest.xml | 15 ++++ testapps/javaProjectTest/lib1/ant.properties | 17 +++++ testapps/javaProjectTest/lib1/build.xml | 83 +++++++++++++++++++++ .../lib1/libs/android-support-v4.jar | Bin 0 -> 247894 bytes testapps/javaProjectTest/lib1/proguard-project.txt | 20 +++++ testapps/javaProjectTest/lib1/project.properties | 15 ++++ .../lib1/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 4147 bytes .../lib1/res/drawable-ldpi/ic_launcher.png | Bin 0 -> 1723 bytes .../lib1/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 2574 bytes testapps/javaProjectTest/lib1/res/layout/main.xml | 13 ++++ .../javaProjectTest/lib1/res/values/strings.xml | 4 + .../lib1/src/com/android/test/lib1/Main.java | 15 ++++ testapps/javaProjectTest/lib2/.classpath | 10 +++ testapps/javaProjectTest/lib2/.project | 33 ++++++++ testapps/javaProjectTest/lib2/AndroidManifest.xml | 15 ++++ testapps/javaProjectTest/lib2/ant.properties | 17 +++++ testapps/javaProjectTest/lib2/build.xml | 83 +++++++++++++++++++++ .../lib2/libs/android-support-v4.jar | Bin 0 -> 247894 bytes testapps/javaProjectTest/lib2/proguard-project.txt | 20 +++++ testapps/javaProjectTest/lib2/project.properties | 15 ++++ .../lib2/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 4147 bytes .../lib2/res/drawable-ldpi/ic_launcher.png | Bin 0 -> 1723 bytes .../lib2/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 2574 bytes testapps/javaProjectTest/lib2/res/layout/main.xml | 13 ++++ .../javaProjectTest/lib2/res/values/strings.xml | 4 + .../lib2/src/com/android/test/lib2/Main.java | 15 ++++ 57 files changed, 641 insertions(+), 179 deletions(-) delete mode 100644 testapps/basicJavaProject/.classpath delete mode 100644 testapps/basicJavaProject/.project delete mode 100644 testapps/basicJavaProject/src/com/android/tests/basicJavaProject/Foo.java delete mode 100644 testapps/basicProjectWithJava/.classpath delete mode 100644 testapps/basicProjectWithJava/.project delete mode 100644 testapps/basicProjectWithJava/AndroidManifest.xml delete mode 100644 testapps/basicProjectWithJava/default.properties delete mode 100644 testapps/basicProjectWithJava/res/drawable-hdpi/icon.png delete mode 100644 testapps/basicProjectWithJava/res/drawable-ldpi/icon.png delete mode 100644 testapps/basicProjectWithJava/res/drawable-mdpi/icon.png delete mode 100644 testapps/basicProjectWithJava/res/layout/main.xml delete mode 100644 testapps/basicProjectWithJava/res/values/strings.xml delete mode 100644 testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/Main.java delete mode 100644 testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/MyTextView.java create mode 100644 testapps/javaProjectTest/app/.classpath create mode 100644 testapps/javaProjectTest/app/.project create mode 100644 testapps/javaProjectTest/app/AndroidManifest.xml create mode 100644 testapps/javaProjectTest/app/project.properties create mode 100644 testapps/javaProjectTest/app/res/drawable-hdpi/icon.png create mode 100644 testapps/javaProjectTest/app/res/drawable-ldpi/icon.png create mode 100644 testapps/javaProjectTest/app/res/drawable-mdpi/icon.png create mode 100644 testapps/javaProjectTest/app/res/layout/main.xml create mode 100644 testapps/javaProjectTest/app/res/values/strings.xml create mode 100644 testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/Main.java create mode 100644 testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/MyTextView.java create mode 100644 testapps/javaProjectTest/javaProject/.classpath create mode 100644 testapps/javaProjectTest/javaProject/.project create mode 100644 testapps/javaProjectTest/javaProject/libs/basicJar.jar create mode 100644 testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java create mode 100644 testapps/javaProjectTest/lib1/.classpath create mode 100644 testapps/javaProjectTest/lib1/.project create mode 100644 testapps/javaProjectTest/lib1/AndroidManifest.xml create mode 100644 testapps/javaProjectTest/lib1/ant.properties create mode 100644 testapps/javaProjectTest/lib1/build.xml create mode 100644 testapps/javaProjectTest/lib1/libs/android-support-v4.jar create mode 100644 testapps/javaProjectTest/lib1/proguard-project.txt create mode 100644 testapps/javaProjectTest/lib1/project.properties create mode 100644 testapps/javaProjectTest/lib1/res/drawable-hdpi/ic_launcher.png create mode 100644 testapps/javaProjectTest/lib1/res/drawable-ldpi/ic_launcher.png create mode 100644 testapps/javaProjectTest/lib1/res/drawable-mdpi/ic_launcher.png create mode 100644 testapps/javaProjectTest/lib1/res/layout/main.xml create mode 100644 testapps/javaProjectTest/lib1/res/values/strings.xml create mode 100644 testapps/javaProjectTest/lib1/src/com/android/test/lib1/Main.java create mode 100644 testapps/javaProjectTest/lib2/.classpath create mode 100644 testapps/javaProjectTest/lib2/.project create mode 100644 testapps/javaProjectTest/lib2/AndroidManifest.xml create mode 100644 testapps/javaProjectTest/lib2/ant.properties create mode 100644 testapps/javaProjectTest/lib2/build.xml create mode 100644 testapps/javaProjectTest/lib2/libs/android-support-v4.jar create mode 100644 testapps/javaProjectTest/lib2/proguard-project.txt create mode 100644 testapps/javaProjectTest/lib2/project.properties create mode 100644 testapps/javaProjectTest/lib2/res/drawable-hdpi/ic_launcher.png create mode 100644 testapps/javaProjectTest/lib2/res/drawable-ldpi/ic_launcher.png create mode 100644 testapps/javaProjectTest/lib2/res/drawable-mdpi/ic_launcher.png create mode 100644 testapps/javaProjectTest/lib2/res/layout/main.xml create mode 100644 testapps/javaProjectTest/lib2/res/values/strings.xml create mode 100644 testapps/javaProjectTest/lib2/src/com/android/test/lib2/Main.java (limited to 'testapps') diff --git a/testapps/basicJavaProject/.classpath b/testapps/basicJavaProject/.classpath deleted file mode 100644 index 8727917..0000000 --- a/testapps/basicJavaProject/.classpath +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/testapps/basicJavaProject/.project b/testapps/basicJavaProject/.project deleted file mode 100644 index 89442a6..0000000 --- a/testapps/basicJavaProject/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - basicJavaProject - - - - - - org.eclipse.jdt.core.javabuilder - - - - - - org.eclipse.jdt.core.javanature - - diff --git a/testapps/basicJavaProject/src/com/android/tests/basicJavaProject/Foo.java b/testapps/basicJavaProject/src/com/android/tests/basicJavaProject/Foo.java deleted file mode 100644 index 4a7d31c..0000000 --- a/testapps/basicJavaProject/src/com/android/tests/basicJavaProject/Foo.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.android.tests.basicJavaProject; - -import java.util.Random; - -public class Foo { - public static int FOO = 42; - - public int getFoo() { - return FOO; - } - - public int getRandomFoo() { - Random r = new Random(System.currentTimeMillis()); - return r.nextInt(FOO); - } -} diff --git a/testapps/basicProjectWithJava/.classpath b/testapps/basicProjectWithJava/.classpath deleted file mode 100644 index 61fad04..0000000 --- a/testapps/basicProjectWithJava/.classpath +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/testapps/basicProjectWithJava/.project b/testapps/basicProjectWithJava/.project deleted file mode 100644 index 5ff4505..0000000 --- a/testapps/basicProjectWithJava/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - basicProjectWithJava - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/testapps/basicProjectWithJava/AndroidManifest.xml b/testapps/basicProjectWithJava/AndroidManifest.xml deleted file mode 100644 index bf7a084..0000000 --- a/testapps/basicProjectWithJava/AndroidManifest.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/testapps/basicProjectWithJava/default.properties b/testapps/basicProjectWithJava/default.properties deleted file mode 100644 index 8ee25b8..0000000 --- a/testapps/basicProjectWithJava/default.properties +++ /dev/null @@ -1,11 +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 use, -# "build.properties", and override values to adapt the script to your -# project structure. - -# Project target. -target=android-AOSP diff --git a/testapps/basicProjectWithJava/res/drawable-hdpi/icon.png b/testapps/basicProjectWithJava/res/drawable-hdpi/icon.png deleted file mode 100644 index 8074c4c..0000000 Binary files a/testapps/basicProjectWithJava/res/drawable-hdpi/icon.png and /dev/null differ diff --git a/testapps/basicProjectWithJava/res/drawable-ldpi/icon.png b/testapps/basicProjectWithJava/res/drawable-ldpi/icon.png deleted file mode 100644 index 1095584..0000000 Binary files a/testapps/basicProjectWithJava/res/drawable-ldpi/icon.png and /dev/null differ diff --git a/testapps/basicProjectWithJava/res/drawable-mdpi/icon.png b/testapps/basicProjectWithJava/res/drawable-mdpi/icon.png deleted file mode 100644 index a07c69f..0000000 Binary files a/testapps/basicProjectWithJava/res/drawable-mdpi/icon.png and /dev/null differ diff --git a/testapps/basicProjectWithJava/res/layout/main.xml b/testapps/basicProjectWithJava/res/layout/main.xml deleted file mode 100644 index 670dd32..0000000 --- a/testapps/basicProjectWithJava/res/layout/main.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/testapps/basicProjectWithJava/res/values/strings.xml b/testapps/basicProjectWithJava/res/values/strings.xml deleted file mode 100644 index 96d8724..0000000 --- a/testapps/basicProjectWithJava/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - basicProjectWithJava - diff --git a/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/Main.java b/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/Main.java deleted file mode 100644 index eb6be25..0000000 --- a/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/Main.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.android.tests.basicProjectWithJava; - -import com.android.tests.basicJavaProject.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.main); - - Foo foo = new Foo(); - - TextView tv = (TextView) findViewById(R.id.text); - tv.setText("basicProjectWithJava\nvalue from java project:" + foo.getRandomFoo()); - } - -} \ No newline at end of file diff --git a/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/MyTextView.java b/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/MyTextView.java deleted file mode 100644 index ae35dca..0000000 --- a/testapps/basicProjectWithJava/src/com/android/tests/basicProjectWithJava/MyTextView.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.android.tests.basicProjectWithJava; - -import com.android.tests.basicJavaProject.Foo; - -import android.content.Context; -import android.util.AttributeSet; -import android.widget.TextView; - -public class MyTextView extends TextView { - - public MyTextView(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - - Foo f = new Foo(); - setText("Foo: " + f.getRandomFoo()); - } - - public MyTextView(Context context, AttributeSet attrs) { - super(context, attrs); - Foo f = new Foo(); - setText("Foo: " + f.getRandomFoo()); - } - - public MyTextView(Context context) { - super(context); - } -} diff --git a/testapps/javaProjectTest/app/.classpath b/testapps/javaProjectTest/app/.classpath new file mode 100644 index 0000000..a4763d1 --- /dev/null +++ b/testapps/javaProjectTest/app/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/testapps/javaProjectTest/app/.project b/testapps/javaProjectTest/app/.project new file mode 100644 index 0000000..69b06f5 --- /dev/null +++ b/testapps/javaProjectTest/app/.project @@ -0,0 +1,33 @@ + + + app + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/testapps/javaProjectTest/app/AndroidManifest.xml b/testapps/javaProjectTest/app/AndroidManifest.xml new file mode 100644 index 0000000..0ccbb84 --- /dev/null +++ b/testapps/javaProjectTest/app/AndroidManifest.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testapps/javaProjectTest/app/project.properties b/testapps/javaProjectTest/app/project.properties new file mode 100644 index 0000000..52891d4 --- /dev/null +++ b/testapps/javaProjectTest/app/project.properties @@ -0,0 +1,16 @@ +# 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.reference.1=../lib1 +android.library.reference.2=../lib2 diff --git a/testapps/javaProjectTest/app/res/drawable-hdpi/icon.png b/testapps/javaProjectTest/app/res/drawable-hdpi/icon.png new file mode 100644 index 0000000..8074c4c Binary files /dev/null and b/testapps/javaProjectTest/app/res/drawable-hdpi/icon.png differ diff --git a/testapps/javaProjectTest/app/res/drawable-ldpi/icon.png b/testapps/javaProjectTest/app/res/drawable-ldpi/icon.png new file mode 100644 index 0000000..1095584 Binary files /dev/null and b/testapps/javaProjectTest/app/res/drawable-ldpi/icon.png differ diff --git a/testapps/javaProjectTest/app/res/drawable-mdpi/icon.png b/testapps/javaProjectTest/app/res/drawable-mdpi/icon.png new file mode 100644 index 0000000..a07c69f Binary files /dev/null and b/testapps/javaProjectTest/app/res/drawable-mdpi/icon.png differ diff --git a/testapps/javaProjectTest/app/res/layout/main.xml b/testapps/javaProjectTest/app/res/layout/main.xml new file mode 100644 index 0000000..670dd32 --- /dev/null +++ b/testapps/javaProjectTest/app/res/layout/main.xml @@ -0,0 +1,18 @@ + + + + + diff --git a/testapps/javaProjectTest/app/res/values/strings.xml b/testapps/javaProjectTest/app/res/values/strings.xml new file mode 100644 index 0000000..96d8724 --- /dev/null +++ b/testapps/javaProjectTest/app/res/values/strings.xml @@ -0,0 +1,4 @@ + + + basicProjectWithJava + diff --git a/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/Main.java b/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/Main.java new file mode 100644 index 0000000..eb6be25 --- /dev/null +++ b/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/Main.java @@ -0,0 +1,22 @@ +package com.android.tests.basicProjectWithJava; + +import com.android.tests.basicJavaProject.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.main); + + Foo foo = new Foo(); + + TextView tv = (TextView) findViewById(R.id.text); + tv.setText("basicProjectWithJava\nvalue from java project:" + foo.getRandomFoo()); + } + +} \ No newline at end of file diff --git a/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/MyTextView.java b/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/MyTextView.java new file mode 100644 index 0000000..ae35dca --- /dev/null +++ b/testapps/javaProjectTest/app/src/com/android/tests/basicProjectWithJava/MyTextView.java @@ -0,0 +1,27 @@ +package com.android.tests.basicProjectWithJava; + +import com.android.tests.basicJavaProject.Foo; + +import android.content.Context; +import android.util.AttributeSet; +import android.widget.TextView; + +public class MyTextView extends TextView { + + public MyTextView(Context context, AttributeSet attrs, int defStyle) { + super(context, attrs, defStyle); + + Foo f = new Foo(); + setText("Foo: " + f.getRandomFoo()); + } + + public MyTextView(Context context, AttributeSet attrs) { + super(context, attrs); + Foo f = new Foo(); + setText("Foo: " + f.getRandomFoo()); + } + + public MyTextView(Context context) { + super(context); + } +} diff --git a/testapps/javaProjectTest/javaProject/.classpath b/testapps/javaProjectTest/javaProject/.classpath new file mode 100644 index 0000000..139d9a3 --- /dev/null +++ b/testapps/javaProjectTest/javaProject/.classpath @@ -0,0 +1,7 @@ + + + + + + + diff --git a/testapps/javaProjectTest/javaProject/.project b/testapps/javaProjectTest/javaProject/.project new file mode 100644 index 0000000..225e486 --- /dev/null +++ b/testapps/javaProjectTest/javaProject/.project @@ -0,0 +1,17 @@ + + + javaProject + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/testapps/javaProjectTest/javaProject/libs/basicJar.jar b/testapps/javaProjectTest/javaProject/libs/basicJar.jar new file mode 100644 index 0000000..8169064 Binary files /dev/null and b/testapps/javaProjectTest/javaProject/libs/basicJar.jar differ diff --git a/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java b/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java new file mode 100644 index 0000000..4a7d31c --- /dev/null +++ b/testapps/javaProjectTest/javaProject/src/com/android/tests/basicJavaProject/Foo.java @@ -0,0 +1,16 @@ +package com.android.tests.basicJavaProject; + +import java.util.Random; + +public class Foo { + public static int FOO = 42; + + public int getFoo() { + return FOO; + } + + public int getRandomFoo() { + Random r = new Random(System.currentTimeMillis()); + return r.nextInt(FOO); + } +} diff --git a/testapps/javaProjectTest/lib1/.classpath b/testapps/javaProjectTest/lib1/.classpath new file mode 100644 index 0000000..71cf1b1 --- /dev/null +++ b/testapps/javaProjectTest/lib1/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/testapps/javaProjectTest/lib1/.project b/testapps/javaProjectTest/lib1/.project new file mode 100644 index 0000000..596b85d --- /dev/null +++ b/testapps/javaProjectTest/lib1/.project @@ -0,0 +1,33 @@ + + + Lib1 + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/testapps/javaProjectTest/lib1/AndroidManifest.xml b/testapps/javaProjectTest/lib1/AndroidManifest.xml new file mode 100644 index 0000000..196db0b --- /dev/null +++ b/testapps/javaProjectTest/lib1/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/testapps/javaProjectTest/lib1/ant.properties b/testapps/javaProjectTest/lib1/ant.properties new file mode 100644 index 0000000..b0971e8 --- /dev/null +++ b/testapps/javaProjectTest/lib1/ant.properties @@ -0,0 +1,17 @@ +# 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 new file mode 100644 index 0000000..2a15ae6 --- /dev/null +++ b/testapps/javaProjectTest/lib1/build.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testapps/javaProjectTest/lib1/libs/android-support-v4.jar b/testapps/javaProjectTest/lib1/libs/android-support-v4.jar new file mode 100644 index 0000000..d006198 Binary files /dev/null and b/testapps/javaProjectTest/lib1/libs/android-support-v4.jar differ diff --git a/testapps/javaProjectTest/lib1/proguard-project.txt b/testapps/javaProjectTest/lib1/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/testapps/javaProjectTest/lib1/proguard-project.txt @@ -0,0 +1,20 @@ +# 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/javaProjectTest/lib1/project.properties b/testapps/javaProjectTest/lib1/project.properties new file mode 100644 index 0000000..36f1594 --- /dev/null +++ b/testapps/javaProjectTest/lib1/project.properties @@ -0,0 +1,15 @@ +# 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 diff --git a/testapps/javaProjectTest/lib1/res/drawable-hdpi/ic_launcher.png b/testapps/javaProjectTest/lib1/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..8074c4c Binary files /dev/null and b/testapps/javaProjectTest/lib1/res/drawable-hdpi/ic_launcher.png differ diff --git a/testapps/javaProjectTest/lib1/res/drawable-ldpi/ic_launcher.png b/testapps/javaProjectTest/lib1/res/drawable-ldpi/ic_launcher.png new file mode 100644 index 0000000..1095584 Binary files /dev/null and b/testapps/javaProjectTest/lib1/res/drawable-ldpi/ic_launcher.png differ diff --git a/testapps/javaProjectTest/lib1/res/drawable-mdpi/ic_launcher.png b/testapps/javaProjectTest/lib1/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..a07c69f Binary files /dev/null and b/testapps/javaProjectTest/lib1/res/drawable-mdpi/ic_launcher.png differ diff --git a/testapps/javaProjectTest/lib1/res/layout/main.xml b/testapps/javaProjectTest/lib1/res/layout/main.xml new file mode 100644 index 0000000..b79cddb --- /dev/null +++ b/testapps/javaProjectTest/lib1/res/layout/main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/testapps/javaProjectTest/lib1/res/values/strings.xml b/testapps/javaProjectTest/lib1/res/values/strings.xml new file mode 100644 index 0000000..549e4ea --- /dev/null +++ b/testapps/javaProjectTest/lib1/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Main + diff --git a/testapps/javaProjectTest/lib1/src/com/android/test/lib1/Main.java b/testapps/javaProjectTest/lib1/src/com/android/test/lib1/Main.java new file mode 100644 index 0000000..116f14a --- /dev/null +++ b/testapps/javaProjectTest/lib1/src/com/android/test/lib1/Main.java @@ -0,0 +1,15 @@ +package com.android.test.lib1; + +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); + } +} diff --git a/testapps/javaProjectTest/lib2/.classpath b/testapps/javaProjectTest/lib2/.classpath new file mode 100644 index 0000000..71cf1b1 --- /dev/null +++ b/testapps/javaProjectTest/lib2/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/testapps/javaProjectTest/lib2/.project b/testapps/javaProjectTest/lib2/.project new file mode 100644 index 0000000..2b723ab --- /dev/null +++ b/testapps/javaProjectTest/lib2/.project @@ -0,0 +1,33 @@ + + + Lib2 + + + + + + com.android.ide.eclipse.adt.ResourceManagerBuilder + + + + + com.android.ide.eclipse.adt.PreCompilerBuilder + + + + + org.eclipse.jdt.core.javabuilder + + + + + com.android.ide.eclipse.adt.ApkBuilder + + + + + + com.android.ide.eclipse.adt.AndroidNature + org.eclipse.jdt.core.javanature + + diff --git a/testapps/javaProjectTest/lib2/AndroidManifest.xml b/testapps/javaProjectTest/lib2/AndroidManifest.xml new file mode 100644 index 0000000..cd7393c --- /dev/null +++ b/testapps/javaProjectTest/lib2/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/testapps/javaProjectTest/lib2/ant.properties b/testapps/javaProjectTest/lib2/ant.properties new file mode 100644 index 0000000..b0971e8 --- /dev/null +++ b/testapps/javaProjectTest/lib2/ant.properties @@ -0,0 +1,17 @@ +# 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/lib2/build.xml b/testapps/javaProjectTest/lib2/build.xml new file mode 100644 index 0000000..3d36fda --- /dev/null +++ b/testapps/javaProjectTest/lib2/build.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testapps/javaProjectTest/lib2/libs/android-support-v4.jar b/testapps/javaProjectTest/lib2/libs/android-support-v4.jar new file mode 100644 index 0000000..d006198 Binary files /dev/null and b/testapps/javaProjectTest/lib2/libs/android-support-v4.jar differ diff --git a/testapps/javaProjectTest/lib2/proguard-project.txt b/testapps/javaProjectTest/lib2/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/testapps/javaProjectTest/lib2/proguard-project.txt @@ -0,0 +1,20 @@ +# 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/javaProjectTest/lib2/project.properties b/testapps/javaProjectTest/lib2/project.properties new file mode 100644 index 0000000..36f1594 --- /dev/null +++ b/testapps/javaProjectTest/lib2/project.properties @@ -0,0 +1,15 @@ +# 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 diff --git a/testapps/javaProjectTest/lib2/res/drawable-hdpi/ic_launcher.png b/testapps/javaProjectTest/lib2/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..8074c4c Binary files /dev/null and b/testapps/javaProjectTest/lib2/res/drawable-hdpi/ic_launcher.png differ diff --git a/testapps/javaProjectTest/lib2/res/drawable-ldpi/ic_launcher.png b/testapps/javaProjectTest/lib2/res/drawable-ldpi/ic_launcher.png new file mode 100644 index 0000000..1095584 Binary files /dev/null and b/testapps/javaProjectTest/lib2/res/drawable-ldpi/ic_launcher.png differ diff --git a/testapps/javaProjectTest/lib2/res/drawable-mdpi/ic_launcher.png b/testapps/javaProjectTest/lib2/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..a07c69f Binary files /dev/null and b/testapps/javaProjectTest/lib2/res/drawable-mdpi/ic_launcher.png differ diff --git a/testapps/javaProjectTest/lib2/res/layout/main.xml b/testapps/javaProjectTest/lib2/res/layout/main.xml new file mode 100644 index 0000000..b79cddb --- /dev/null +++ b/testapps/javaProjectTest/lib2/res/layout/main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/testapps/javaProjectTest/lib2/res/values/strings.xml b/testapps/javaProjectTest/lib2/res/values/strings.xml new file mode 100644 index 0000000..549e4ea --- /dev/null +++ b/testapps/javaProjectTest/lib2/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Main + diff --git a/testapps/javaProjectTest/lib2/src/com/android/test/lib2/Main.java b/testapps/javaProjectTest/lib2/src/com/android/test/lib2/Main.java new file mode 100644 index 0000000..45dad32 --- /dev/null +++ b/testapps/javaProjectTest/lib2/src/com/android/test/lib2/Main.java @@ -0,0 +1,15 @@ +package com.android.test.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); + } +} -- cgit v1.1