From 44a21c237072fba5454732c74d1f7653523c4105 Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Thu, 23 Feb 2012 11:07:19 -0800 Subject: Fix issue when a project and its libraries use the same jar files. This is only an issue in Ant because in Eclipse we don't automatically pull the jar files from libraries into the main project (we should somehow now that we have the Library Projects jar container that is dynamic). Right now we do a simple size/sha1 check on libraries that have the same name to figure out if they are the same version. If they are we only use one in the dex step (that notoriously fails to add the same class twice). If they are different we stop the build as it's an error (having two library projects depending on two different versions of a jar file should be an error as we can be sure the two versions are API compatible). For later: not use the file name only? find a way to version the libraries and to have them declare whether they are API compatible with older versions? Also added a hard-coded case for the Android Support Library. If both the v4 and the v13 are detected, use the v13 only as it includes the v4 already. New test apps. Three cases: - main and library projects with duplicate jar files that are identical - main and library projects with duplicate jar files that are NOT identical - main and library projects with v4 and v13 in the dependency list. Change-Id: I3a9abdcbec635d7c9d3228bdd105120f77178b27 --- testapps/.gitignore | 6 +- .../basicLibWithSupport/AndroidManifest.xml | 15 ++++ .../basicLibWithSupport/ant.properties | 17 +++++ .../jarCheckTests1/basicLibWithSupport/build.xml | 85 +++++++++++++++++++++ .../libs/android-support-v4.jar | Bin 0 -> 247894 bytes .../basicLibWithSupport/proguard-project.txt | 20 +++++ .../basicLibWithSupport/project.properties | 13 ++++ .../basicLibWithSupport/res/layout/main.xml | 13 ++++ .../basicLibWithSupport/res/values/strings.xml | 4 + .../android/tests/libwithsupport/MyActivity.java | 15 ++++ .../basicLibWithSupport2/AndroidManifest.xml | 15 ++++ .../basicLibWithSupport2/ant.properties | 17 +++++ .../jarCheckTests1/basicLibWithSupport2/build.xml | 85 +++++++++++++++++++++ .../libs/android-support-v4.jar | Bin 0 -> 247894 bytes .../basicLibWithSupport2/proguard-project.txt | 20 +++++ .../basicLibWithSupport2/project.properties | 13 ++++ .../basicLibWithSupport2/res/layout/main.xml | 13 ++++ .../basicLibWithSupport2/res/values/strings.xml | 4 + .../android/tests/libwithsupport2/MyActivity.java | 15 ++++ .../basicProjectWithSupport/AndroidManifest.xml | 15 ++++ .../basicProjectWithSupport/ant.properties | 17 +++++ .../basicProjectWithSupport/build.xml | 85 +++++++++++++++++++++ .../libs/android-support-v4.jar | Bin 0 -> 247894 bytes .../basicProjectWithSupport/libs/foo.txt | 1 + .../basicProjectWithSupport/proguard-project.txt | 20 +++++ .../basicProjectWithSupport/project.properties | 13 ++++ .../basicProjectWithSupport/res/layout/main.xml | 13 ++++ .../basicProjectWithSupport/res/values/strings.xml | 4 + .../tests/projectwithsupport/MyActivity.java | 15 ++++ .../jarCheckTests2/basicLibWithSupport/.classpath | 9 +++ .../jarCheckTests2/basicLibWithSupport/.project | 33 ++++++++ .../basicLibWithSupport/AndroidManifest.xml | 15 ++++ .../basicLibWithSupport/ant.properties | 17 +++++ .../jarCheckTests2/basicLibWithSupport/build.xml | 85 +++++++++++++++++++++ .../libs/android-support-v4.jar | Bin 0 -> 247894 bytes .../basicLibWithSupport/proguard-project.txt | 20 +++++ .../basicLibWithSupport/project.properties | 13 ++++ .../basicLibWithSupport/res/layout/main.xml | 13 ++++ .../basicLibWithSupport/res/values/strings.xml | 4 + .../android/tests/libwithsupport/MyActivity.java | 15 ++++ .../jarCheckTests2/basicLibWithSupport2/.classpath | 9 +++ .../jarCheckTests2/basicLibWithSupport2/.project | 33 ++++++++ .../basicLibWithSupport2/AndroidManifest.xml | 15 ++++ .../basicLibWithSupport2/ant.properties | 17 +++++ .../jarCheckTests2/basicLibWithSupport2/build.xml | 85 +++++++++++++++++++++ .../libs/android-support-v4.jar | Bin 0 -> 244970 bytes .../basicLibWithSupport2/proguard-project.txt | 20 +++++ .../basicLibWithSupport2/project.properties | 13 ++++ .../basicLibWithSupport2/res/layout/main.xml | 13 ++++ .../basicLibWithSupport2/res/values/strings.xml | 4 + .../android/tests/libwithsupport2/MyActivity.java | 15 ++++ .../basicProjectWithSupport/.classpath | 8 ++ .../basicProjectWithSupport/.project | 33 ++++++++ .../basicProjectWithSupport/AndroidManifest.xml | 15 ++++ .../basicProjectWithSupport/ant.properties | 17 +++++ .../basicProjectWithSupport/build.xml | 85 +++++++++++++++++++++ .../basicProjectWithSupport/libs/foo.txt | 1 + .../basicProjectWithSupport/proguard-project.txt | 20 +++++ .../basicProjectWithSupport/project.properties | 13 ++++ .../basicProjectWithSupport/res/layout/main.xml | 13 ++++ .../basicProjectWithSupport/res/values/strings.xml | 4 + .../tests/projectwithsupport/MyActivity.java | 15 ++++ .../basicLibWithSupport/AndroidManifest.xml | 15 ++++ .../basicLibWithSupport/ant.properties | 17 +++++ .../jarCheckTests3/basicLibWithSupport/build.xml | 85 +++++++++++++++++++++ .../libs/android-support-v4.jar | Bin 0 -> 247894 bytes .../basicLibWithSupport/proguard-project.txt | 20 +++++ .../basicLibWithSupport/project.properties | 13 ++++ .../basicLibWithSupport/res/layout/main.xml | 13 ++++ .../basicLibWithSupport/res/values/strings.xml | 4 + .../android/tests/libwithsupport/MyActivity.java | 15 ++++ .../basicLibWithSupport2/AndroidManifest.xml | 15 ++++ .../basicLibWithSupport2/ant.properties | 17 +++++ .../jarCheckTests3/basicLibWithSupport2/build.xml | 85 +++++++++++++++++++++ .../libs/android-support-v13.jar | Bin 0 -> 307683 bytes .../basicLibWithSupport2/proguard-project.txt | 20 +++++ .../basicLibWithSupport2/project.properties | 13 ++++ .../basicLibWithSupport2/res/layout/main.xml | 13 ++++ .../basicLibWithSupport2/res/values/strings.xml | 4 + .../android/tests/libwithsupport2/MyActivity.java | 15 ++++ .../basicProjectWithSupport/AndroidManifest.xml | 15 ++++ .../basicProjectWithSupport/ant.properties | 17 +++++ .../basicProjectWithSupport/build.xml | 85 +++++++++++++++++++++ .../basicProjectWithSupport/libs/foo.txt | 1 + .../basicProjectWithSupport/proguard-project.txt | 20 +++++ .../basicProjectWithSupport/project.properties | 13 ++++ .../basicProjectWithSupport/res/layout/main.xml | 13 ++++ .../basicProjectWithSupport/res/values/strings.xml | 4 + .../tests/projectwithsupport/MyActivity.java | 15 ++++ 89 files changed, 1769 insertions(+), 3 deletions(-) create mode 100644 testapps/jarCheckTests1/basicLibWithSupport/AndroidManifest.xml create mode 100644 testapps/jarCheckTests1/basicLibWithSupport/ant.properties create mode 100644 testapps/jarCheckTests1/basicLibWithSupport/build.xml create mode 100644 testapps/jarCheckTests1/basicLibWithSupport/libs/android-support-v4.jar create mode 100644 testapps/jarCheckTests1/basicLibWithSupport/proguard-project.txt create mode 100644 testapps/jarCheckTests1/basicLibWithSupport/project.properties create mode 100644 testapps/jarCheckTests1/basicLibWithSupport/res/layout/main.xml create mode 100644 testapps/jarCheckTests1/basicLibWithSupport/res/values/strings.xml create mode 100644 testapps/jarCheckTests1/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java create mode 100644 testapps/jarCheckTests1/basicLibWithSupport2/AndroidManifest.xml create mode 100644 testapps/jarCheckTests1/basicLibWithSupport2/ant.properties create mode 100644 testapps/jarCheckTests1/basicLibWithSupport2/build.xml create mode 100644 testapps/jarCheckTests1/basicLibWithSupport2/libs/android-support-v4.jar create mode 100644 testapps/jarCheckTests1/basicLibWithSupport2/proguard-project.txt create mode 100644 testapps/jarCheckTests1/basicLibWithSupport2/project.properties create mode 100644 testapps/jarCheckTests1/basicLibWithSupport2/res/layout/main.xml create mode 100644 testapps/jarCheckTests1/basicLibWithSupport2/res/values/strings.xml create mode 100644 testapps/jarCheckTests1/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java create mode 100644 testapps/jarCheckTests1/basicProjectWithSupport/AndroidManifest.xml create mode 100644 testapps/jarCheckTests1/basicProjectWithSupport/ant.properties create mode 100644 testapps/jarCheckTests1/basicProjectWithSupport/build.xml create mode 100644 testapps/jarCheckTests1/basicProjectWithSupport/libs/android-support-v4.jar create mode 100644 testapps/jarCheckTests1/basicProjectWithSupport/libs/foo.txt create mode 100644 testapps/jarCheckTests1/basicProjectWithSupport/proguard-project.txt create mode 100644 testapps/jarCheckTests1/basicProjectWithSupport/project.properties create mode 100644 testapps/jarCheckTests1/basicProjectWithSupport/res/layout/main.xml create mode 100644 testapps/jarCheckTests1/basicProjectWithSupport/res/values/strings.xml create mode 100644 testapps/jarCheckTests1/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java create mode 100644 testapps/jarCheckTests2/basicLibWithSupport/.classpath create mode 100644 testapps/jarCheckTests2/basicLibWithSupport/.project create mode 100644 testapps/jarCheckTests2/basicLibWithSupport/AndroidManifest.xml create mode 100644 testapps/jarCheckTests2/basicLibWithSupport/ant.properties create mode 100644 testapps/jarCheckTests2/basicLibWithSupport/build.xml create mode 100644 testapps/jarCheckTests2/basicLibWithSupport/libs/android-support-v4.jar create mode 100644 testapps/jarCheckTests2/basicLibWithSupport/proguard-project.txt create mode 100644 testapps/jarCheckTests2/basicLibWithSupport/project.properties create mode 100644 testapps/jarCheckTests2/basicLibWithSupport/res/layout/main.xml create mode 100644 testapps/jarCheckTests2/basicLibWithSupport/res/values/strings.xml create mode 100644 testapps/jarCheckTests2/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java create mode 100644 testapps/jarCheckTests2/basicLibWithSupport2/.classpath create mode 100644 testapps/jarCheckTests2/basicLibWithSupport2/.project create mode 100644 testapps/jarCheckTests2/basicLibWithSupport2/AndroidManifest.xml create mode 100644 testapps/jarCheckTests2/basicLibWithSupport2/ant.properties create mode 100644 testapps/jarCheckTests2/basicLibWithSupport2/build.xml create mode 100644 testapps/jarCheckTests2/basicLibWithSupport2/libs/android-support-v4.jar create mode 100644 testapps/jarCheckTests2/basicLibWithSupport2/proguard-project.txt create mode 100644 testapps/jarCheckTests2/basicLibWithSupport2/project.properties create mode 100644 testapps/jarCheckTests2/basicLibWithSupport2/res/layout/main.xml create mode 100644 testapps/jarCheckTests2/basicLibWithSupport2/res/values/strings.xml create mode 100644 testapps/jarCheckTests2/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java create mode 100644 testapps/jarCheckTests2/basicProjectWithSupport/.classpath create mode 100644 testapps/jarCheckTests2/basicProjectWithSupport/.project create mode 100644 testapps/jarCheckTests2/basicProjectWithSupport/AndroidManifest.xml create mode 100644 testapps/jarCheckTests2/basicProjectWithSupport/ant.properties create mode 100644 testapps/jarCheckTests2/basicProjectWithSupport/build.xml create mode 100644 testapps/jarCheckTests2/basicProjectWithSupport/libs/foo.txt create mode 100644 testapps/jarCheckTests2/basicProjectWithSupport/proguard-project.txt create mode 100644 testapps/jarCheckTests2/basicProjectWithSupport/project.properties create mode 100644 testapps/jarCheckTests2/basicProjectWithSupport/res/layout/main.xml create mode 100644 testapps/jarCheckTests2/basicProjectWithSupport/res/values/strings.xml create mode 100644 testapps/jarCheckTests2/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java create mode 100644 testapps/jarCheckTests3/basicLibWithSupport/AndroidManifest.xml create mode 100644 testapps/jarCheckTests3/basicLibWithSupport/ant.properties create mode 100644 testapps/jarCheckTests3/basicLibWithSupport/build.xml create mode 100644 testapps/jarCheckTests3/basicLibWithSupport/libs/android-support-v4.jar create mode 100644 testapps/jarCheckTests3/basicLibWithSupport/proguard-project.txt create mode 100644 testapps/jarCheckTests3/basicLibWithSupport/project.properties create mode 100644 testapps/jarCheckTests3/basicLibWithSupport/res/layout/main.xml create mode 100644 testapps/jarCheckTests3/basicLibWithSupport/res/values/strings.xml create mode 100644 testapps/jarCheckTests3/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java create mode 100644 testapps/jarCheckTests3/basicLibWithSupport2/AndroidManifest.xml create mode 100644 testapps/jarCheckTests3/basicLibWithSupport2/ant.properties create mode 100644 testapps/jarCheckTests3/basicLibWithSupport2/build.xml create mode 100644 testapps/jarCheckTests3/basicLibWithSupport2/libs/android-support-v13.jar create mode 100644 testapps/jarCheckTests3/basicLibWithSupport2/proguard-project.txt create mode 100644 testapps/jarCheckTests3/basicLibWithSupport2/project.properties create mode 100644 testapps/jarCheckTests3/basicLibWithSupport2/res/layout/main.xml create mode 100644 testapps/jarCheckTests3/basicLibWithSupport2/res/values/strings.xml create mode 100644 testapps/jarCheckTests3/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java create mode 100644 testapps/jarCheckTests3/basicProjectWithSupport/AndroidManifest.xml create mode 100644 testapps/jarCheckTests3/basicProjectWithSupport/ant.properties create mode 100644 testapps/jarCheckTests3/basicProjectWithSupport/build.xml create mode 100644 testapps/jarCheckTests3/basicProjectWithSupport/libs/foo.txt create mode 100644 testapps/jarCheckTests3/basicProjectWithSupport/proguard-project.txt create mode 100644 testapps/jarCheckTests3/basicProjectWithSupport/project.properties create mode 100644 testapps/jarCheckTests3/basicProjectWithSupport/res/layout/main.xml create mode 100644 testapps/jarCheckTests3/basicProjectWithSupport/res/values/strings.xml create mode 100644 testapps/jarCheckTests3/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java (limited to 'testapps') diff --git a/testapps/.gitignore b/testapps/.gitignore index 0c75cfd..846ae70 100644 --- a/testapps/.gitignore +++ b/testapps/.gitignore @@ -1,3 +1,3 @@ -*/bin -*/local.properties -*/gen +bin +local.properties +gen diff --git a/testapps/jarCheckTests1/basicLibWithSupport/AndroidManifest.xml b/testapps/jarCheckTests1/basicLibWithSupport/AndroidManifest.xml new file mode 100644 index 0000000..a634bdb --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/testapps/jarCheckTests1/basicLibWithSupport/ant.properties b/testapps/jarCheckTests1/basicLibWithSupport/ant.properties new file mode 100644 index 0000000..ee52d86 --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport/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 in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/testapps/jarCheckTests1/basicLibWithSupport/build.xml b/testapps/jarCheckTests1/basicLibWithSupport/build.xml new file mode 100644 index 0000000..772f422 --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport/build.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testapps/jarCheckTests1/basicLibWithSupport/libs/android-support-v4.jar b/testapps/jarCheckTests1/basicLibWithSupport/libs/android-support-v4.jar new file mode 100644 index 0000000..d006198 Binary files /dev/null and b/testapps/jarCheckTests1/basicLibWithSupport/libs/android-support-v4.jar differ diff --git a/testapps/jarCheckTests1/basicLibWithSupport/proguard-project.txt b/testapps/jarCheckTests1/basicLibWithSupport/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport/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/jarCheckTests1/basicLibWithSupport/project.properties b/testapps/jarCheckTests1/basicLibWithSupport/project.properties new file mode 100644 index 0000000..23d80c4 --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport/project.properties @@ -0,0 +1,13 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-15 +android.library=true + diff --git a/testapps/jarCheckTests1/basicLibWithSupport/res/layout/main.xml b/testapps/jarCheckTests1/basicLibWithSupport/res/layout/main.xml new file mode 100644 index 0000000..7fe5dce --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport/res/layout/main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/testapps/jarCheckTests1/basicLibWithSupport/res/values/strings.xml b/testapps/jarCheckTests1/basicLibWithSupport/res/values/strings.xml new file mode 100644 index 0000000..3fa203a --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport/res/values/strings.xml @@ -0,0 +1,4 @@ + + + MyActivity + diff --git a/testapps/jarCheckTests1/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java b/testapps/jarCheckTests1/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java new file mode 100644 index 0000000..2c316ca --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java @@ -0,0 +1,15 @@ +package com.android.tests.libwithsupport; + +import android.app.Activity; +import android.os.Bundle; + +public class MyActivity 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/jarCheckTests1/basicLibWithSupport2/AndroidManifest.xml b/testapps/jarCheckTests1/basicLibWithSupport2/AndroidManifest.xml new file mode 100644 index 0000000..6fa91eb --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport2/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/ant.properties b/testapps/jarCheckTests1/basicLibWithSupport2/ant.properties new file mode 100644 index 0000000..ee52d86 --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport2/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 in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/build.xml b/testapps/jarCheckTests1/basicLibWithSupport2/build.xml new file mode 100644 index 0000000..772f422 --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport2/build.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/libs/android-support-v4.jar b/testapps/jarCheckTests1/basicLibWithSupport2/libs/android-support-v4.jar new file mode 100644 index 0000000..d006198 Binary files /dev/null and b/testapps/jarCheckTests1/basicLibWithSupport2/libs/android-support-v4.jar differ diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/proguard-project.txt b/testapps/jarCheckTests1/basicLibWithSupport2/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport2/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/jarCheckTests1/basicLibWithSupport2/project.properties b/testapps/jarCheckTests1/basicLibWithSupport2/project.properties new file mode 100644 index 0000000..23d80c4 --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport2/project.properties @@ -0,0 +1,13 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-15 +android.library=true + diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/res/layout/main.xml b/testapps/jarCheckTests1/basicLibWithSupport2/res/layout/main.xml new file mode 100644 index 0000000..7fe5dce --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport2/res/layout/main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/res/values/strings.xml b/testapps/jarCheckTests1/basicLibWithSupport2/res/values/strings.xml new file mode 100644 index 0000000..3fa203a --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport2/res/values/strings.xml @@ -0,0 +1,4 @@ + + + MyActivity + diff --git a/testapps/jarCheckTests1/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java b/testapps/jarCheckTests1/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java new file mode 100644 index 0000000..fc97aa7 --- /dev/null +++ b/testapps/jarCheckTests1/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java @@ -0,0 +1,15 @@ +package com.android.tests.libwithsupport2; + +import android.app.Activity; +import android.os.Bundle; + +public class MyActivity 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/jarCheckTests1/basicProjectWithSupport/AndroidManifest.xml b/testapps/jarCheckTests1/basicProjectWithSupport/AndroidManifest.xml new file mode 100644 index 0000000..ff41761 --- /dev/null +++ b/testapps/jarCheckTests1/basicProjectWithSupport/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/ant.properties b/testapps/jarCheckTests1/basicProjectWithSupport/ant.properties new file mode 100644 index 0000000..ee52d86 --- /dev/null +++ b/testapps/jarCheckTests1/basicProjectWithSupport/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 in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/build.xml b/testapps/jarCheckTests1/basicProjectWithSupport/build.xml new file mode 100644 index 0000000..f3a3d91 --- /dev/null +++ b/testapps/jarCheckTests1/basicProjectWithSupport/build.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/libs/android-support-v4.jar b/testapps/jarCheckTests1/basicProjectWithSupport/libs/android-support-v4.jar new file mode 100644 index 0000000..d006198 Binary files /dev/null and b/testapps/jarCheckTests1/basicProjectWithSupport/libs/android-support-v4.jar differ diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/libs/foo.txt b/testapps/jarCheckTests1/basicProjectWithSupport/libs/foo.txt new file mode 100644 index 0000000..fe0c852 --- /dev/null +++ b/testapps/jarCheckTests1/basicProjectWithSupport/libs/foo.txt @@ -0,0 +1 @@ +sdf \ No newline at end of file diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/proguard-project.txt b/testapps/jarCheckTests1/basicProjectWithSupport/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/testapps/jarCheckTests1/basicProjectWithSupport/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/jarCheckTests1/basicProjectWithSupport/project.properties b/testapps/jarCheckTests1/basicProjectWithSupport/project.properties new file mode 100644 index 0000000..3c58bfa --- /dev/null +++ b/testapps/jarCheckTests1/basicProjectWithSupport/project.properties @@ -0,0 +1,13 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-15 +android.library.reference.1=../basicLibWithSupport +android.library.reference.2=../basicLibWithSupport2 diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/res/layout/main.xml b/testapps/jarCheckTests1/basicProjectWithSupport/res/layout/main.xml new file mode 100644 index 0000000..7fe5dce --- /dev/null +++ b/testapps/jarCheckTests1/basicProjectWithSupport/res/layout/main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/res/values/strings.xml b/testapps/jarCheckTests1/basicProjectWithSupport/res/values/strings.xml new file mode 100644 index 0000000..3fa203a --- /dev/null +++ b/testapps/jarCheckTests1/basicProjectWithSupport/res/values/strings.xml @@ -0,0 +1,4 @@ + + + MyActivity + diff --git a/testapps/jarCheckTests1/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java b/testapps/jarCheckTests1/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java new file mode 100644 index 0000000..c065839 --- /dev/null +++ b/testapps/jarCheckTests1/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java @@ -0,0 +1,15 @@ +package com.android.tests.projectwithsupport; + +import android.app.Activity; +import android.os.Bundle; + +public class MyActivity 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/jarCheckTests2/basicLibWithSupport/.classpath b/testapps/jarCheckTests2/basicLibWithSupport/.classpath new file mode 100644 index 0000000..c5c5afd --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/testapps/jarCheckTests2/basicLibWithSupport/.project b/testapps/jarCheckTests2/basicLibWithSupport/.project new file mode 100644 index 0000000..467950f --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport/.project @@ -0,0 +1,33 @@ + + + test2Lib1 + + + + + + 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/jarCheckTests2/basicLibWithSupport/AndroidManifest.xml b/testapps/jarCheckTests2/basicLibWithSupport/AndroidManifest.xml new file mode 100644 index 0000000..a634bdb --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/testapps/jarCheckTests2/basicLibWithSupport/ant.properties b/testapps/jarCheckTests2/basicLibWithSupport/ant.properties new file mode 100644 index 0000000..ee52d86 --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport/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 in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/testapps/jarCheckTests2/basicLibWithSupport/build.xml b/testapps/jarCheckTests2/basicLibWithSupport/build.xml new file mode 100644 index 0000000..772f422 --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport/build.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testapps/jarCheckTests2/basicLibWithSupport/libs/android-support-v4.jar b/testapps/jarCheckTests2/basicLibWithSupport/libs/android-support-v4.jar new file mode 100644 index 0000000..d006198 Binary files /dev/null and b/testapps/jarCheckTests2/basicLibWithSupport/libs/android-support-v4.jar differ diff --git a/testapps/jarCheckTests2/basicLibWithSupport/proguard-project.txt b/testapps/jarCheckTests2/basicLibWithSupport/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport/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/jarCheckTests2/basicLibWithSupport/project.properties b/testapps/jarCheckTests2/basicLibWithSupport/project.properties new file mode 100644 index 0000000..23d80c4 --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport/project.properties @@ -0,0 +1,13 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-15 +android.library=true + diff --git a/testapps/jarCheckTests2/basicLibWithSupport/res/layout/main.xml b/testapps/jarCheckTests2/basicLibWithSupport/res/layout/main.xml new file mode 100644 index 0000000..7fe5dce --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport/res/layout/main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/testapps/jarCheckTests2/basicLibWithSupport/res/values/strings.xml b/testapps/jarCheckTests2/basicLibWithSupport/res/values/strings.xml new file mode 100644 index 0000000..3fa203a --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport/res/values/strings.xml @@ -0,0 +1,4 @@ + + + MyActivity + diff --git a/testapps/jarCheckTests2/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java b/testapps/jarCheckTests2/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java new file mode 100644 index 0000000..2c316ca --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java @@ -0,0 +1,15 @@ +package com.android.tests.libwithsupport; + +import android.app.Activity; +import android.os.Bundle; + +public class MyActivity 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/jarCheckTests2/basicLibWithSupport2/.classpath b/testapps/jarCheckTests2/basicLibWithSupport2/.classpath new file mode 100644 index 0000000..c5c5afd --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport2/.classpath @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/.project b/testapps/jarCheckTests2/basicLibWithSupport2/.project new file mode 100644 index 0000000..efeaaae --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport2/.project @@ -0,0 +1,33 @@ + + + test2Lib2 + + + + + + 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/jarCheckTests2/basicLibWithSupport2/AndroidManifest.xml b/testapps/jarCheckTests2/basicLibWithSupport2/AndroidManifest.xml new file mode 100644 index 0000000..6fa91eb --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport2/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/ant.properties b/testapps/jarCheckTests2/basicLibWithSupport2/ant.properties new file mode 100644 index 0000000..ee52d86 --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport2/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 in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/build.xml b/testapps/jarCheckTests2/basicLibWithSupport2/build.xml new file mode 100644 index 0000000..772f422 --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport2/build.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/libs/android-support-v4.jar b/testapps/jarCheckTests2/basicLibWithSupport2/libs/android-support-v4.jar new file mode 100644 index 0000000..1e90718 Binary files /dev/null and b/testapps/jarCheckTests2/basicLibWithSupport2/libs/android-support-v4.jar differ diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/proguard-project.txt b/testapps/jarCheckTests2/basicLibWithSupport2/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport2/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/jarCheckTests2/basicLibWithSupport2/project.properties b/testapps/jarCheckTests2/basicLibWithSupport2/project.properties new file mode 100644 index 0000000..23d80c4 --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport2/project.properties @@ -0,0 +1,13 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-15 +android.library=true + diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/res/layout/main.xml b/testapps/jarCheckTests2/basicLibWithSupport2/res/layout/main.xml new file mode 100644 index 0000000..7fe5dce --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport2/res/layout/main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/res/values/strings.xml b/testapps/jarCheckTests2/basicLibWithSupport2/res/values/strings.xml new file mode 100644 index 0000000..3fa203a --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport2/res/values/strings.xml @@ -0,0 +1,4 @@ + + + MyActivity + diff --git a/testapps/jarCheckTests2/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java b/testapps/jarCheckTests2/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java new file mode 100644 index 0000000..fc97aa7 --- /dev/null +++ b/testapps/jarCheckTests2/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java @@ -0,0 +1,15 @@ +package com.android.tests.libwithsupport2; + +import android.app.Activity; +import android.os.Bundle; + +public class MyActivity 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/jarCheckTests2/basicProjectWithSupport/.classpath b/testapps/jarCheckTests2/basicProjectWithSupport/.classpath new file mode 100644 index 0000000..a4763d1 --- /dev/null +++ b/testapps/jarCheckTests2/basicProjectWithSupport/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/.project b/testapps/jarCheckTests2/basicProjectWithSupport/.project new file mode 100644 index 0000000..f236696 --- /dev/null +++ b/testapps/jarCheckTests2/basicProjectWithSupport/.project @@ -0,0 +1,33 @@ + + + test2App + + + + + + 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/jarCheckTests2/basicProjectWithSupport/AndroidManifest.xml b/testapps/jarCheckTests2/basicProjectWithSupport/AndroidManifest.xml new file mode 100644 index 0000000..ff41761 --- /dev/null +++ b/testapps/jarCheckTests2/basicProjectWithSupport/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/ant.properties b/testapps/jarCheckTests2/basicProjectWithSupport/ant.properties new file mode 100644 index 0000000..ee52d86 --- /dev/null +++ b/testapps/jarCheckTests2/basicProjectWithSupport/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 in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/build.xml b/testapps/jarCheckTests2/basicProjectWithSupport/build.xml new file mode 100644 index 0000000..f3a3d91 --- /dev/null +++ b/testapps/jarCheckTests2/basicProjectWithSupport/build.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/libs/foo.txt b/testapps/jarCheckTests2/basicProjectWithSupport/libs/foo.txt new file mode 100644 index 0000000..fe0c852 --- /dev/null +++ b/testapps/jarCheckTests2/basicProjectWithSupport/libs/foo.txt @@ -0,0 +1 @@ +sdf \ No newline at end of file diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/proguard-project.txt b/testapps/jarCheckTests2/basicProjectWithSupport/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/testapps/jarCheckTests2/basicProjectWithSupport/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/jarCheckTests2/basicProjectWithSupport/project.properties b/testapps/jarCheckTests2/basicProjectWithSupport/project.properties new file mode 100644 index 0000000..cf77006 --- /dev/null +++ b/testapps/jarCheckTests2/basicProjectWithSupport/project.properties @@ -0,0 +1,13 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-15 +android.library.reference.1=../basicLibWithSupport +android.library.reference.2=../basicLibWithSupport2 \ No newline at end of file diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/res/layout/main.xml b/testapps/jarCheckTests2/basicProjectWithSupport/res/layout/main.xml new file mode 100644 index 0000000..7fe5dce --- /dev/null +++ b/testapps/jarCheckTests2/basicProjectWithSupport/res/layout/main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/res/values/strings.xml b/testapps/jarCheckTests2/basicProjectWithSupport/res/values/strings.xml new file mode 100644 index 0000000..3fa203a --- /dev/null +++ b/testapps/jarCheckTests2/basicProjectWithSupport/res/values/strings.xml @@ -0,0 +1,4 @@ + + + MyActivity + diff --git a/testapps/jarCheckTests2/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java b/testapps/jarCheckTests2/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java new file mode 100644 index 0000000..c065839 --- /dev/null +++ b/testapps/jarCheckTests2/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java @@ -0,0 +1,15 @@ +package com.android.tests.projectwithsupport; + +import android.app.Activity; +import android.os.Bundle; + +public class MyActivity 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/jarCheckTests3/basicLibWithSupport/AndroidManifest.xml b/testapps/jarCheckTests3/basicLibWithSupport/AndroidManifest.xml new file mode 100644 index 0000000..a634bdb --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/testapps/jarCheckTests3/basicLibWithSupport/ant.properties b/testapps/jarCheckTests3/basicLibWithSupport/ant.properties new file mode 100644 index 0000000..ee52d86 --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport/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 in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/testapps/jarCheckTests3/basicLibWithSupport/build.xml b/testapps/jarCheckTests3/basicLibWithSupport/build.xml new file mode 100644 index 0000000..772f422 --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport/build.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testapps/jarCheckTests3/basicLibWithSupport/libs/android-support-v4.jar b/testapps/jarCheckTests3/basicLibWithSupport/libs/android-support-v4.jar new file mode 100644 index 0000000..d006198 Binary files /dev/null and b/testapps/jarCheckTests3/basicLibWithSupport/libs/android-support-v4.jar differ diff --git a/testapps/jarCheckTests3/basicLibWithSupport/proguard-project.txt b/testapps/jarCheckTests3/basicLibWithSupport/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport/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/jarCheckTests3/basicLibWithSupport/project.properties b/testapps/jarCheckTests3/basicLibWithSupport/project.properties new file mode 100644 index 0000000..23d80c4 --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport/project.properties @@ -0,0 +1,13 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-15 +android.library=true + diff --git a/testapps/jarCheckTests3/basicLibWithSupport/res/layout/main.xml b/testapps/jarCheckTests3/basicLibWithSupport/res/layout/main.xml new file mode 100644 index 0000000..7fe5dce --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport/res/layout/main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/testapps/jarCheckTests3/basicLibWithSupport/res/values/strings.xml b/testapps/jarCheckTests3/basicLibWithSupport/res/values/strings.xml new file mode 100644 index 0000000..3fa203a --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport/res/values/strings.xml @@ -0,0 +1,4 @@ + + + MyActivity + diff --git a/testapps/jarCheckTests3/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java b/testapps/jarCheckTests3/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java new file mode 100644 index 0000000..2c316ca --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport/src/com/android/tests/libwithsupport/MyActivity.java @@ -0,0 +1,15 @@ +package com.android.tests.libwithsupport; + +import android.app.Activity; +import android.os.Bundle; + +public class MyActivity 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/jarCheckTests3/basicLibWithSupport2/AndroidManifest.xml b/testapps/jarCheckTests3/basicLibWithSupport2/AndroidManifest.xml new file mode 100644 index 0000000..6fa91eb --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport2/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/ant.properties b/testapps/jarCheckTests3/basicLibWithSupport2/ant.properties new file mode 100644 index 0000000..ee52d86 --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport2/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 in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/build.xml b/testapps/jarCheckTests3/basicLibWithSupport2/build.xml new file mode 100644 index 0000000..772f422 --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport2/build.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/libs/android-support-v13.jar b/testapps/jarCheckTests3/basicLibWithSupport2/libs/android-support-v13.jar new file mode 100644 index 0000000..c9354ec Binary files /dev/null and b/testapps/jarCheckTests3/basicLibWithSupport2/libs/android-support-v13.jar differ diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/proguard-project.txt b/testapps/jarCheckTests3/basicLibWithSupport2/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport2/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/jarCheckTests3/basicLibWithSupport2/project.properties b/testapps/jarCheckTests3/basicLibWithSupport2/project.properties new file mode 100644 index 0000000..23d80c4 --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport2/project.properties @@ -0,0 +1,13 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-15 +android.library=true + diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/res/layout/main.xml b/testapps/jarCheckTests3/basicLibWithSupport2/res/layout/main.xml new file mode 100644 index 0000000..7fe5dce --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport2/res/layout/main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/res/values/strings.xml b/testapps/jarCheckTests3/basicLibWithSupport2/res/values/strings.xml new file mode 100644 index 0000000..3fa203a --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport2/res/values/strings.xml @@ -0,0 +1,4 @@ + + + MyActivity + diff --git a/testapps/jarCheckTests3/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java b/testapps/jarCheckTests3/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java new file mode 100644 index 0000000..fc97aa7 --- /dev/null +++ b/testapps/jarCheckTests3/basicLibWithSupport2/src/com/android/tests/libwithsupport2/MyActivity.java @@ -0,0 +1,15 @@ +package com.android.tests.libwithsupport2; + +import android.app.Activity; +import android.os.Bundle; + +public class MyActivity 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/jarCheckTests3/basicProjectWithSupport/AndroidManifest.xml b/testapps/jarCheckTests3/basicProjectWithSupport/AndroidManifest.xml new file mode 100644 index 0000000..ff41761 --- /dev/null +++ b/testapps/jarCheckTests3/basicProjectWithSupport/AndroidManifest.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/ant.properties b/testapps/jarCheckTests3/basicProjectWithSupport/ant.properties new file mode 100644 index 0000000..ee52d86 --- /dev/null +++ b/testapps/jarCheckTests3/basicProjectWithSupport/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 in Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/build.xml b/testapps/jarCheckTests3/basicProjectWithSupport/build.xml new file mode 100644 index 0000000..f3a3d91 --- /dev/null +++ b/testapps/jarCheckTests3/basicProjectWithSupport/build.xml @@ -0,0 +1,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/libs/foo.txt b/testapps/jarCheckTests3/basicProjectWithSupport/libs/foo.txt new file mode 100644 index 0000000..fe0c852 --- /dev/null +++ b/testapps/jarCheckTests3/basicProjectWithSupport/libs/foo.txt @@ -0,0 +1 @@ +sdf \ No newline at end of file diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/proguard-project.txt b/testapps/jarCheckTests3/basicProjectWithSupport/proguard-project.txt new file mode 100644 index 0000000..f2fe155 --- /dev/null +++ b/testapps/jarCheckTests3/basicProjectWithSupport/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/jarCheckTests3/basicProjectWithSupport/project.properties b/testapps/jarCheckTests3/basicProjectWithSupport/project.properties new file mode 100644 index 0000000..3c58bfa --- /dev/null +++ b/testapps/jarCheckTests3/basicProjectWithSupport/project.properties @@ -0,0 +1,13 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system use, +# "ant.properties", and override values to adapt the script to your +# project structure. + +# Project target. +target=android-15 +android.library.reference.1=../basicLibWithSupport +android.library.reference.2=../basicLibWithSupport2 diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/res/layout/main.xml b/testapps/jarCheckTests3/basicProjectWithSupport/res/layout/main.xml new file mode 100644 index 0000000..7fe5dce --- /dev/null +++ b/testapps/jarCheckTests3/basicProjectWithSupport/res/layout/main.xml @@ -0,0 +1,13 @@ + + + + + diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/res/values/strings.xml b/testapps/jarCheckTests3/basicProjectWithSupport/res/values/strings.xml new file mode 100644 index 0000000..3fa203a --- /dev/null +++ b/testapps/jarCheckTests3/basicProjectWithSupport/res/values/strings.xml @@ -0,0 +1,4 @@ + + + MyActivity + diff --git a/testapps/jarCheckTests3/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java b/testapps/jarCheckTests3/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java new file mode 100644 index 0000000..c065839 --- /dev/null +++ b/testapps/jarCheckTests3/basicProjectWithSupport/src/com/android/tests/projectwithsupport/MyActivity.java @@ -0,0 +1,15 @@ +package com.android.tests.projectwithsupport; + +import android.app.Activity; +import android.os.Bundle; + +public class MyActivity 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