From 601d6fe6fc000c61a050bf9ee0a4ae4dd1ed0516 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Wed, 28 Mar 2012 15:54:12 -0700 Subject: Updated test apps for the SDK. - added buildconfigtest - removed libWithLibTest which is redundant with libsAndJarTest - updated libsAndJarTest to have lib1 depend on lib2. - Added COMPILE_AND_RUN for test apps that must be run. Change-Id: If57a684826a04c0821932edd71e9970b0eb92f4b --- testapps/buildConfigTest/COMPILE_AND_RUN | 0 testapps/buildConfigTest/SUCCESS | 0 testapps/buildConfigTest/app/.classpath | 8 ++ testapps/buildConfigTest/app/.project | 33 ++++++++ testapps/buildConfigTest/app/AndroidManifest.xml | 15 ++++ testapps/buildConfigTest/app/ant.properties | 17 +++++ testapps/buildConfigTest/app/build.xml | 83 +++++++++++++++++++++ testapps/buildConfigTest/app/lint.xml | 3 + testapps/buildConfigTest/app/proguard-project.txt | 20 +++++ testapps/buildConfigTest/app/project.properties | 15 ++++ .../app/res/drawable-hdpi/ic_launcher.png | Bin 0 -> 4147 bytes .../app/res/drawable-ldpi/ic_launcher.png | Bin 0 -> 1723 bytes .../app/res/drawable-mdpi/ic_launcher.png | Bin 0 -> 2574 bytes testapps/buildConfigTest/app/res/layout/main.xml | 22 ++++++ .../buildConfigTest/app/res/values/strings.xml | 4 + .../com/android/tests/buildconfigtest/Main.java | 26 +++++++ testapps/buildConfigTest/lib1/.classpath | 8 ++ testapps/buildConfigTest/lib1/.project | 33 ++++++++ testapps/buildConfigTest/lib1/AndroidManifest.xml | 21 ++++++ testapps/buildConfigTest/lib1/build.xml | 83 +++++++++++++++++++++ testapps/buildConfigTest/lib1/proguard-project.txt | 20 +++++ testapps/buildConfigTest/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 .../buildConfigTest/lib1/res/values/strings.xml | 4 + .../android/tests/buildconfigtest/lib1/Lib1.java | 17 +++++ testapps/gridlayoutTest/COMPILE_AND_RUN | 0 testapps/gridlayoutTest/SUCCESS | 0 testapps/javaProjectTest/COMPILE_AND_RUN | 0 testapps/libWithLibTest/.DS_Store | Bin 6148 -> 0 bytes testapps/libWithLibTest/app/.classpath | 8 -- testapps/libWithLibTest/app/.project | 33 -------- testapps/libWithLibTest/app/AndroidManifest.xml | 21 ------ testapps/libWithLibTest/app/ant.properties | 17 ----- testapps/libWithLibTest/app/build.xml | 83 --------------------- testapps/libWithLibTest/app/proguard-project.txt | 20 ----- testapps/libWithLibTest/app/project.properties | 12 --- testapps/libWithLibTest/app/res/values/strings.xml | 4 - testapps/libWithLibTest/lib1/.classpath | 8 -- testapps/libWithLibTest/lib1/.project | 33 -------- testapps/libWithLibTest/lib1/AndroidManifest.xml | 16 ---- testapps/libWithLibTest/lib1/ant.properties | 17 ----- testapps/libWithLibTest/lib1/build.xml | 83 --------------------- testapps/libWithLibTest/lib1/proguard-project.txt | 20 ----- testapps/libWithLibTest/lib1/project.properties | 13 ---- testapps/libWithLibTest/lib1/res/drawable/icon.png | Bin 2574 -> 0 bytes .../lib1/res/layout/basiclib_main.xml | 13 ---- .../libWithLibTest/lib1/res/values/strings.xml | 4 - .../lib1/src/com/android/tests/basiclib/Main.java | 15 ---- testapps/libWithLibTest/lib2/.classpath | 8 -- testapps/libWithLibTest/lib2/.project | 33 -------- testapps/libWithLibTest/lib2/AndroidManifest.xml | 15 ---- testapps/libWithLibTest/lib2/ant.properties | 17 ----- testapps/libWithLibTest/lib2/build.xml | 83 --------------------- testapps/libWithLibTest/lib2/libs/basicJar.jar | Bin 1791 -> 0 bytes testapps/libWithLibTest/lib2/proguard-project.txt | 20 ----- testapps/libWithLibTest/lib2/project.properties | 12 --- testapps/libWithLibTest/lib2/res/drawable/icon.png | Bin 2574 -> 0 bytes .../lib2/res/layout/basiclibwithjar_main.xml | 14 ---- testapps/libWithLibTest/lib2/res/layout/main.xml | 14 ---- testapps/libWithLibTest/lib2/res/values/ids.xml | 4 - .../libWithLibTest/lib2/res/values/strings.xml | 4 - .../com/android/tests/basiclibwithjar/Main.java | 25 ------- testapps/libsAndJarTest/COMPILE_AND_RUN | 0 testapps/libsAndJarTest/app/.project | 2 +- testapps/libsAndJarTest/app/project.properties | 1 - testapps/libsAndJarTest/lib1/.project | 2 +- testapps/libsAndJarTest/lib1/project.properties | 1 + testapps/libsAndJarTest/lib2/.project | 2 +- testapps/testProjectTest/COMPILE_AND_RUN | 0 testapps/userLibTest/COMPILE_AND_RUN | 0 72 files changed, 451 insertions(+), 673 deletions(-) create mode 100644 testapps/buildConfigTest/COMPILE_AND_RUN create mode 100644 testapps/buildConfigTest/SUCCESS create mode 100644 testapps/buildConfigTest/app/.classpath create mode 100644 testapps/buildConfigTest/app/.project create mode 100644 testapps/buildConfigTest/app/AndroidManifest.xml create mode 100644 testapps/buildConfigTest/app/ant.properties create mode 100644 testapps/buildConfigTest/app/build.xml create mode 100644 testapps/buildConfigTest/app/lint.xml create mode 100644 testapps/buildConfigTest/app/proguard-project.txt create mode 100644 testapps/buildConfigTest/app/project.properties create mode 100644 testapps/buildConfigTest/app/res/drawable-hdpi/ic_launcher.png create mode 100644 testapps/buildConfigTest/app/res/drawable-ldpi/ic_launcher.png create mode 100644 testapps/buildConfigTest/app/res/drawable-mdpi/ic_launcher.png create mode 100644 testapps/buildConfigTest/app/res/layout/main.xml create mode 100644 testapps/buildConfigTest/app/res/values/strings.xml create mode 100644 testapps/buildConfigTest/app/src/com/android/tests/buildconfigtest/Main.java create mode 100644 testapps/buildConfigTest/lib1/.classpath create mode 100644 testapps/buildConfigTest/lib1/.project create mode 100644 testapps/buildConfigTest/lib1/AndroidManifest.xml create mode 100644 testapps/buildConfigTest/lib1/build.xml create mode 100644 testapps/buildConfigTest/lib1/proguard-project.txt create mode 100644 testapps/buildConfigTest/lib1/project.properties create mode 100644 testapps/buildConfigTest/lib1/res/drawable-hdpi/ic_launcher.png create mode 100644 testapps/buildConfigTest/lib1/res/drawable-ldpi/ic_launcher.png create mode 100644 testapps/buildConfigTest/lib1/res/drawable-mdpi/ic_launcher.png create mode 100644 testapps/buildConfigTest/lib1/res/values/strings.xml create mode 100644 testapps/buildConfigTest/lib1/src/com/android/tests/buildconfigtest/lib1/Lib1.java create mode 100644 testapps/gridlayoutTest/COMPILE_AND_RUN create mode 100644 testapps/gridlayoutTest/SUCCESS create mode 100644 testapps/javaProjectTest/COMPILE_AND_RUN delete mode 100644 testapps/libWithLibTest/.DS_Store delete mode 100644 testapps/libWithLibTest/app/.classpath delete mode 100644 testapps/libWithLibTest/app/.project delete mode 100644 testapps/libWithLibTest/app/AndroidManifest.xml delete mode 100644 testapps/libWithLibTest/app/ant.properties delete mode 100644 testapps/libWithLibTest/app/build.xml delete mode 100644 testapps/libWithLibTest/app/proguard-project.txt delete mode 100644 testapps/libWithLibTest/app/project.properties delete mode 100644 testapps/libWithLibTest/app/res/values/strings.xml delete mode 100644 testapps/libWithLibTest/lib1/.classpath delete mode 100644 testapps/libWithLibTest/lib1/.project delete mode 100644 testapps/libWithLibTest/lib1/AndroidManifest.xml delete mode 100644 testapps/libWithLibTest/lib1/ant.properties delete mode 100644 testapps/libWithLibTest/lib1/build.xml delete mode 100644 testapps/libWithLibTest/lib1/proguard-project.txt delete mode 100644 testapps/libWithLibTest/lib1/project.properties delete mode 100644 testapps/libWithLibTest/lib1/res/drawable/icon.png delete mode 100644 testapps/libWithLibTest/lib1/res/layout/basiclib_main.xml delete mode 100644 testapps/libWithLibTest/lib1/res/values/strings.xml delete mode 100644 testapps/libWithLibTest/lib1/src/com/android/tests/basiclib/Main.java delete mode 100644 testapps/libWithLibTest/lib2/.classpath delete mode 100644 testapps/libWithLibTest/lib2/.project delete mode 100644 testapps/libWithLibTest/lib2/AndroidManifest.xml delete mode 100644 testapps/libWithLibTest/lib2/ant.properties delete mode 100644 testapps/libWithLibTest/lib2/build.xml delete mode 100644 testapps/libWithLibTest/lib2/libs/basicJar.jar delete mode 100644 testapps/libWithLibTest/lib2/proguard-project.txt delete mode 100644 testapps/libWithLibTest/lib2/project.properties delete mode 100644 testapps/libWithLibTest/lib2/res/drawable/icon.png delete mode 100644 testapps/libWithLibTest/lib2/res/layout/basiclibwithjar_main.xml delete mode 100644 testapps/libWithLibTest/lib2/res/layout/main.xml delete mode 100644 testapps/libWithLibTest/lib2/res/values/ids.xml delete mode 100644 testapps/libWithLibTest/lib2/res/values/strings.xml delete mode 100644 testapps/libWithLibTest/lib2/src/com/android/tests/basiclibwithjar/Main.java create mode 100644 testapps/libsAndJarTest/COMPILE_AND_RUN create mode 100644 testapps/testProjectTest/COMPILE_AND_RUN create mode 100644 testapps/userLibTest/COMPILE_AND_RUN (limited to 'testapps') diff --git a/testapps/buildConfigTest/COMPILE_AND_RUN b/testapps/buildConfigTest/COMPILE_AND_RUN new file mode 100644 index 0000000..e69de29 diff --git a/testapps/buildConfigTest/SUCCESS b/testapps/buildConfigTest/SUCCESS new file mode 100644 index 0000000..e69de29 diff --git a/testapps/buildConfigTest/app/.classpath b/testapps/buildConfigTest/app/.classpath new file mode 100644 index 0000000..a4763d1 --- /dev/null +++ b/testapps/buildConfigTest/app/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/testapps/buildConfigTest/app/.project b/testapps/buildConfigTest/app/.project new file mode 100644 index 0000000..dd37abe --- /dev/null +++ b/testapps/buildConfigTest/app/.project @@ -0,0 +1,33 @@ + + + buildConfigTest-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/buildConfigTest/app/AndroidManifest.xml b/testapps/buildConfigTest/app/AndroidManifest.xml new file mode 100644 index 0000000..50e30b9 --- /dev/null +++ b/testapps/buildConfigTest/app/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/testapps/buildConfigTest/app/ant.properties b/testapps/buildConfigTest/app/ant.properties new file mode 100644 index 0000000..b0971e8 --- /dev/null +++ b/testapps/buildConfigTest/app/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/buildConfigTest/app/build.xml b/testapps/buildConfigTest/app/build.xml new file mode 100644 index 0000000..09cd907 --- /dev/null +++ b/testapps/buildConfigTest/app/build.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testapps/buildConfigTest/app/lint.xml b/testapps/buildConfigTest/app/lint.xml new file mode 100644 index 0000000..ee0eead --- /dev/null +++ b/testapps/buildConfigTest/app/lint.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/testapps/buildConfigTest/app/proguard-project.txt b/testapps/buildConfigTest/app/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/testapps/buildConfigTest/app/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/buildConfigTest/app/project.properties b/testapps/buildConfigTest/app/project.properties new file mode 100644 index 0000000..c42f7ef --- /dev/null +++ b/testapps/buildConfigTest/app/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.reference.1=../lib1 diff --git a/testapps/buildConfigTest/app/res/drawable-hdpi/ic_launcher.png b/testapps/buildConfigTest/app/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..8074c4c Binary files /dev/null and b/testapps/buildConfigTest/app/res/drawable-hdpi/ic_launcher.png differ diff --git a/testapps/buildConfigTest/app/res/drawable-ldpi/ic_launcher.png b/testapps/buildConfigTest/app/res/drawable-ldpi/ic_launcher.png new file mode 100644 index 0000000..1095584 Binary files /dev/null and b/testapps/buildConfigTest/app/res/drawable-ldpi/ic_launcher.png differ diff --git a/testapps/buildConfigTest/app/res/drawable-mdpi/ic_launcher.png b/testapps/buildConfigTest/app/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..a07c69f Binary files /dev/null and b/testapps/buildConfigTest/app/res/drawable-mdpi/ic_launcher.png differ diff --git a/testapps/buildConfigTest/app/res/layout/main.xml b/testapps/buildConfigTest/app/res/layout/main.xml new file mode 100644 index 0000000..6a3de67 --- /dev/null +++ b/testapps/buildConfigTest/app/res/layout/main.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/testapps/buildConfigTest/app/res/values/strings.xml b/testapps/buildConfigTest/app/res/values/strings.xml new file mode 100644 index 0000000..004b9f0 --- /dev/null +++ b/testapps/buildConfigTest/app/res/values/strings.xml @@ -0,0 +1,4 @@ + + + BuildConfigTest + diff --git a/testapps/buildConfigTest/app/src/com/android/tests/buildconfigtest/Main.java b/testapps/buildConfigTest/app/src/com/android/tests/buildconfigtest/Main.java new file mode 100644 index 0000000..6421c60 --- /dev/null +++ b/testapps/buildConfigTest/app/src/com/android/tests/buildconfigtest/Main.java @@ -0,0 +1,26 @@ +package com.android.tests.buildconfigtest; + +import android.app.Activity; +import android.os.Bundle; +import android.widget.TextView; + +import com.android.tests.buildconfigtest.lib1.Lib1; + +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); + + if (BuildConfig.DEBUG) { + TextView tv = (TextView) findViewById(R.id.app); + tv.setText("App: DEBUG"); + } + + TextView tv = (TextView) findViewById(R.id.lib1); + tv.setText("Lib: " + Lib1.getContent()); + } +} diff --git a/testapps/buildConfigTest/lib1/.classpath b/testapps/buildConfigTest/lib1/.classpath new file mode 100644 index 0000000..a4763d1 --- /dev/null +++ b/testapps/buildConfigTest/lib1/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/testapps/buildConfigTest/lib1/.project b/testapps/buildConfigTest/lib1/.project new file mode 100644 index 0000000..22c9a5b --- /dev/null +++ b/testapps/buildConfigTest/lib1/.project @@ -0,0 +1,33 @@ + + + buildConfigTest-Lib + + + + + + 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/buildConfigTest/lib1/AndroidManifest.xml b/testapps/buildConfigTest/lib1/AndroidManifest.xml new file mode 100644 index 0000000..58aa624 --- /dev/null +++ b/testapps/buildConfigTest/lib1/AndroidManifest.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/testapps/buildConfigTest/lib1/build.xml b/testapps/buildConfigTest/lib1/build.xml new file mode 100644 index 0000000..2a15ae6 --- /dev/null +++ b/testapps/buildConfigTest/lib1/build.xml @@ -0,0 +1,83 @@ + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testapps/buildConfigTest/lib1/proguard-project.txt b/testapps/buildConfigTest/lib1/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/testapps/buildConfigTest/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/buildConfigTest/lib1/project.properties b/testapps/buildConfigTest/lib1/project.properties new file mode 100644 index 0000000..36f1594 --- /dev/null +++ b/testapps/buildConfigTest/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/buildConfigTest/lib1/res/drawable-hdpi/ic_launcher.png b/testapps/buildConfigTest/lib1/res/drawable-hdpi/ic_launcher.png new file mode 100644 index 0000000..8074c4c Binary files /dev/null and b/testapps/buildConfigTest/lib1/res/drawable-hdpi/ic_launcher.png differ diff --git a/testapps/buildConfigTest/lib1/res/drawable-ldpi/ic_launcher.png b/testapps/buildConfigTest/lib1/res/drawable-ldpi/ic_launcher.png new file mode 100644 index 0000000..1095584 Binary files /dev/null and b/testapps/buildConfigTest/lib1/res/drawable-ldpi/ic_launcher.png differ diff --git a/testapps/buildConfigTest/lib1/res/drawable-mdpi/ic_launcher.png b/testapps/buildConfigTest/lib1/res/drawable-mdpi/ic_launcher.png new file mode 100644 index 0000000..a07c69f Binary files /dev/null and b/testapps/buildConfigTest/lib1/res/drawable-mdpi/ic_launcher.png differ diff --git a/testapps/buildConfigTest/lib1/res/values/strings.xml b/testapps/buildConfigTest/lib1/res/values/strings.xml new file mode 100644 index 0000000..549e4ea --- /dev/null +++ b/testapps/buildConfigTest/lib1/res/values/strings.xml @@ -0,0 +1,4 @@ + + + Main + diff --git a/testapps/buildConfigTest/lib1/src/com/android/tests/buildconfigtest/lib1/Lib1.java b/testapps/buildConfigTest/lib1/src/com/android/tests/buildconfigtest/lib1/Lib1.java new file mode 100644 index 0000000..cca0eff --- /dev/null +++ b/testapps/buildConfigTest/lib1/src/com/android/tests/buildconfigtest/lib1/Lib1.java @@ -0,0 +1,17 @@ +package com.android.tests.buildconfigtest.lib1; + +import com.android.tests.javaprojecttest.lib1.BuildConfig; + + +public class Lib1 { + + public static String getContent() { + String a = "Release"; + + if (BuildConfig.DEBUG) { + a = "DEBUG"; + } + + return a; + } +} diff --git a/testapps/gridlayoutTest/COMPILE_AND_RUN b/testapps/gridlayoutTest/COMPILE_AND_RUN new file mode 100644 index 0000000..e69de29 diff --git a/testapps/gridlayoutTest/SUCCESS b/testapps/gridlayoutTest/SUCCESS new file mode 100644 index 0000000..e69de29 diff --git a/testapps/javaProjectTest/COMPILE_AND_RUN b/testapps/javaProjectTest/COMPILE_AND_RUN new file mode 100644 index 0000000..e69de29 diff --git a/testapps/libWithLibTest/.DS_Store b/testapps/libWithLibTest/.DS_Store deleted file mode 100644 index 8d9d631..0000000 Binary files a/testapps/libWithLibTest/.DS_Store and /dev/null differ diff --git a/testapps/libWithLibTest/app/.classpath b/testapps/libWithLibTest/app/.classpath deleted file mode 100644 index a4763d1..0000000 --- a/testapps/libWithLibTest/app/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/testapps/libWithLibTest/app/.project b/testapps/libWithLibTest/app/.project deleted file mode 100644 index 39feaec..0000000 --- a/testapps/libWithLibTest/app/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - libWithLibTest-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/libWithLibTest/app/AndroidManifest.xml b/testapps/libWithLibTest/app/AndroidManifest.xml deleted file mode 100644 index 4870542..0000000 --- a/testapps/libWithLibTest/app/AndroidManifest.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/testapps/libWithLibTest/app/ant.properties b/testapps/libWithLibTest/app/ant.properties deleted file mode 100644 index b0971e8..0000000 --- a/testapps/libWithLibTest/app/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/libWithLibTest/app/build.xml b/testapps/libWithLibTest/app/build.xml deleted file mode 100644 index bc17734..0000000 --- a/testapps/libWithLibTest/app/build.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/testapps/libWithLibTest/app/proguard-project.txt b/testapps/libWithLibTest/app/proguard-project.txt deleted file mode 100644 index f2fe155..0000000 --- a/testapps/libWithLibTest/app/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/libWithLibTest/app/project.properties b/testapps/libWithLibTest/app/project.properties deleted file mode 100644 index 6133d73..0000000 --- a/testapps/libWithLibTest/app/project.properties +++ /dev/null @@ -1,12 +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-15 -android.library.reference.1=../lib1 diff --git a/testapps/libWithLibTest/app/res/values/strings.xml b/testapps/libWithLibTest/app/res/values/strings.xml deleted file mode 100644 index bdca683..0000000 --- a/testapps/libWithLibTest/app/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - basicProjectWithLib - diff --git a/testapps/libWithLibTest/lib1/.classpath b/testapps/libWithLibTest/lib1/.classpath deleted file mode 100644 index a4763d1..0000000 --- a/testapps/libWithLibTest/lib1/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/testapps/libWithLibTest/lib1/.project b/testapps/libWithLibTest/lib1/.project deleted file mode 100644 index d256174..0000000 --- a/testapps/libWithLibTest/lib1/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - libWithLibTest-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/libWithLibTest/lib1/AndroidManifest.xml b/testapps/libWithLibTest/lib1/AndroidManifest.xml deleted file mode 100644 index aaf0fff..0000000 --- a/testapps/libWithLibTest/lib1/AndroidManifest.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - diff --git a/testapps/libWithLibTest/lib1/ant.properties b/testapps/libWithLibTest/lib1/ant.properties deleted file mode 100644 index b0971e8..0000000 --- a/testapps/libWithLibTest/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/libWithLibTest/lib1/build.xml b/testapps/libWithLibTest/lib1/build.xml deleted file mode 100644 index bc17734..0000000 --- a/testapps/libWithLibTest/lib1/build.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/testapps/libWithLibTest/lib1/proguard-project.txt b/testapps/libWithLibTest/lib1/proguard-project.txt deleted file mode 100644 index f2fe155..0000000 --- a/testapps/libWithLibTest/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/libWithLibTest/lib1/project.properties b/testapps/libWithLibTest/lib1/project.properties deleted file mode 100644 index 6bb4bd0..0000000 --- a/testapps/libWithLibTest/lib1/project.properties +++ /dev/null @@ -1,13 +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-15 -android.library=true -android.library.reference.1=../lib2 diff --git a/testapps/libWithLibTest/lib1/res/drawable/icon.png b/testapps/libWithLibTest/lib1/res/drawable/icon.png deleted file mode 100644 index a07c69f..0000000 Binary files a/testapps/libWithLibTest/lib1/res/drawable/icon.png and /dev/null differ diff --git a/testapps/libWithLibTest/lib1/res/layout/basiclib_main.xml b/testapps/libWithLibTest/lib1/res/layout/basiclib_main.xml deleted file mode 100644 index 37e5c2c..0000000 --- a/testapps/libWithLibTest/lib1/res/layout/basiclib_main.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - diff --git a/testapps/libWithLibTest/lib1/res/values/strings.xml b/testapps/libWithLibTest/lib1/res/values/strings.xml deleted file mode 100644 index 1bdf988..0000000 --- a/testapps/libWithLibTest/lib1/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - basicLib - diff --git a/testapps/libWithLibTest/lib1/src/com/android/tests/basiclib/Main.java b/testapps/libWithLibTest/lib1/src/com/android/tests/basiclib/Main.java deleted file mode 100644 index 0be5f11..0000000 --- a/testapps/libWithLibTest/lib1/src/com/android/tests/basiclib/Main.java +++ /dev/null @@ -1,15 +0,0 @@ -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/lib2/.classpath b/testapps/libWithLibTest/lib2/.classpath deleted file mode 100644 index a4763d1..0000000 --- a/testapps/libWithLibTest/lib2/.classpath +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/testapps/libWithLibTest/lib2/.project b/testapps/libWithLibTest/lib2/.project deleted file mode 100644 index 5f68270..0000000 --- a/testapps/libWithLibTest/lib2/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - libWithLibTest-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/libWithLibTest/lib2/AndroidManifest.xml b/testapps/libWithLibTest/lib2/AndroidManifest.xml deleted file mode 100644 index 1363206..0000000 --- a/testapps/libWithLibTest/lib2/AndroidManifest.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - diff --git a/testapps/libWithLibTest/lib2/ant.properties b/testapps/libWithLibTest/lib2/ant.properties deleted file mode 100644 index b0971e8..0000000 --- a/testapps/libWithLibTest/lib2/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/libWithLibTest/lib2/build.xml b/testapps/libWithLibTest/lib2/build.xml deleted file mode 100644 index bc17734..0000000 --- a/testapps/libWithLibTest/lib2/build.xml +++ /dev/null @@ -1,83 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/testapps/libWithLibTest/lib2/libs/basicJar.jar b/testapps/libWithLibTest/lib2/libs/basicJar.jar deleted file mode 100644 index 319ed02..0000000 Binary files a/testapps/libWithLibTest/lib2/libs/basicJar.jar and /dev/null differ diff --git a/testapps/libWithLibTest/lib2/proguard-project.txt b/testapps/libWithLibTest/lib2/proguard-project.txt deleted file mode 100644 index f2fe155..0000000 --- a/testapps/libWithLibTest/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/libWithLibTest/lib2/project.properties b/testapps/libWithLibTest/lib2/project.properties deleted file mode 100644 index 7414a68..0000000 --- a/testapps/libWithLibTest/lib2/project.properties +++ /dev/null @@ -1,12 +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-15 -android.library=true diff --git a/testapps/libWithLibTest/lib2/res/drawable/icon.png b/testapps/libWithLibTest/lib2/res/drawable/icon.png deleted file mode 100644 index a07c69f..0000000 Binary files a/testapps/libWithLibTest/lib2/res/drawable/icon.png and /dev/null differ diff --git a/testapps/libWithLibTest/lib2/res/layout/basiclibwithjar_main.xml b/testapps/libWithLibTest/lib2/res/layout/basiclibwithjar_main.xml deleted file mode 100644 index 5fefdd7..0000000 --- a/testapps/libWithLibTest/lib2/res/layout/basiclibwithjar_main.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - diff --git a/testapps/libWithLibTest/lib2/res/layout/main.xml b/testapps/libWithLibTest/lib2/res/layout/main.xml deleted file mode 100644 index fc39355..0000000 --- a/testapps/libWithLibTest/lib2/res/layout/main.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - diff --git a/testapps/libWithLibTest/lib2/res/values/ids.xml b/testapps/libWithLibTest/lib2/res/values/ids.xml deleted file mode 100644 index 8cbe2cc..0000000 --- a/testapps/libWithLibTest/lib2/res/values/ids.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/testapps/libWithLibTest/lib2/res/values/strings.xml b/testapps/libWithLibTest/lib2/res/values/strings.xml deleted file mode 100644 index 1701887..0000000 --- a/testapps/libWithLibTest/lib2/res/values/strings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - basicLibWithJar - diff --git a/testapps/libWithLibTest/lib2/src/com/android/tests/basiclibwithjar/Main.java b/testapps/libWithLibTest/lib2/src/com/android/tests/basiclibwithjar/Main.java deleted file mode 100644 index a7b782a..0000000 --- a/testapps/libWithLibTest/lib2/src/com/android/tests/basiclibwithjar/Main.java +++ /dev/null @@ -1,25 +0,0 @@ -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/libsAndJarTest/COMPILE_AND_RUN b/testapps/libsAndJarTest/COMPILE_AND_RUN new file mode 100644 index 0000000..e69de29 diff --git a/testapps/libsAndJarTest/app/.project b/testapps/libsAndJarTest/app/.project index 187fb0e..dc5f570 100644 --- a/testapps/libsAndJarTest/app/.project +++ b/testapps/libsAndJarTest/app/.project @@ -1,6 +1,6 @@ - javaProjectTest-app + libsAndJarTest-app diff --git a/testapps/libsAndJarTest/app/project.properties b/testapps/libsAndJarTest/app/project.properties index 9384511..4fe0502 100644 --- a/testapps/libsAndJarTest/app/project.properties +++ b/testapps/libsAndJarTest/app/project.properties @@ -13,4 +13,3 @@ proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project. # Project target. target=android-15 android.library.reference.1=../lib1 -android.library.reference.2=../lib2 diff --git a/testapps/libsAndJarTest/lib1/.project b/testapps/libsAndJarTest/lib1/.project index cac8ac1..616ff1f 100644 --- a/testapps/libsAndJarTest/lib1/.project +++ b/testapps/libsAndJarTest/lib1/.project @@ -1,6 +1,6 @@ - javaProjectTest-Lib1 + libsAndJarTest-Lib1 diff --git a/testapps/libsAndJarTest/lib1/project.properties b/testapps/libsAndJarTest/lib1/project.properties index 36f1594..480c5b6 100644 --- a/testapps/libsAndJarTest/lib1/project.properties +++ b/testapps/libsAndJarTest/lib1/project.properties @@ -13,3 +13,4 @@ # Project target. target=android-15 android.library=true +android.library.reference.1=../lib2 diff --git a/testapps/libsAndJarTest/lib2/.project b/testapps/libsAndJarTest/lib2/.project index 63d7a48..3f2ef16 100644 --- a/testapps/libsAndJarTest/lib2/.project +++ b/testapps/libsAndJarTest/lib2/.project @@ -1,6 +1,6 @@ - javaProjectTest-Lib2 + libsAndJarTest-Lib2 diff --git a/testapps/testProjectTest/COMPILE_AND_RUN b/testapps/testProjectTest/COMPILE_AND_RUN new file mode 100644 index 0000000..e69de29 diff --git a/testapps/userLibTest/COMPILE_AND_RUN b/testapps/userLibTest/COMPILE_AND_RUN new file mode 100644 index 0000000..e69de29 -- cgit v1.1