aboutsummaryrefslogtreecommitdiffstats
path: root/testapps/jarCheckTests3/basicLibWithSupport2/res/layout/main.xml
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-02-23 11:07:19 -0800
committerXavier Ducrohet <xav@android.com>2012-02-24 17:24:06 -0800
commit44a21c237072fba5454732c74d1f7653523c4105 (patch)
treefd5ea83ab6d2359acf969d231fe5b11a168aa7e1 /testapps/jarCheckTests3/basicLibWithSupport2/res/layout/main.xml
parent9e36cb7689bf68ceafff3385e95dc24b756c34d5 (diff)
downloadsdk-44a21c237072fba5454732c74d1f7653523c4105.zip
sdk-44a21c237072fba5454732c74d1f7653523c4105.tar.gz
sdk-44a21c237072fba5454732c74d1f7653523c4105.tar.bz2
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
Diffstat (limited to 'testapps/jarCheckTests3/basicLibWithSupport2/res/layout/main.xml')
-rw-r--r--testapps/jarCheckTests3/basicLibWithSupport2/res/layout/main.xml13
1 files changed, 13 insertions, 0 deletions
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 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ >
+<TextView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="Hello World, MyActivity"
+ />
+</LinearLayout>
+