aboutsummaryrefslogtreecommitdiffstats
path: root/testapps/libsAndJarTest/lib1
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2012-03-28 15:54:12 -0700
committerXavier Ducrohet <xav@android.com>2012-03-28 16:00:41 -0700
commit601d6fe6fc000c61a050bf9ee0a4ae4dd1ed0516 (patch)
treebcd12b56ec324fcf64c335270a717aabd3def65d /testapps/libsAndJarTest/lib1
parent90e9820290bec86982cac91a9ee163466a7521c4 (diff)
downloadsdk-601d6fe6fc000c61a050bf9ee0a4ae4dd1ed0516.tar.gz
sdk-601d6fe6fc000c61a050bf9ee0a4ae4dd1ed0516.tar.bz2
sdk-601d6fe6fc000c61a050bf9ee0a4ae4dd1ed0516.zip
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
Diffstat (limited to 'testapps/libsAndJarTest/lib1')
-rw-r--r--testapps/libsAndJarTest/lib1/.project2
-rw-r--r--testapps/libsAndJarTest/lib1/project.properties1
2 files changed, 2 insertions, 1 deletions
diff --git a/testapps/libsAndJarTest/lib1/.project b/testapps/libsAndJarTest/lib1/.project
index cac8ac1a0..616ff1fc9 100644
--- a/testapps/libsAndJarTest/lib1/.project
+++ b/testapps/libsAndJarTest/lib1/.project
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
- <name>javaProjectTest-Lib1</name>
+ <name>libsAndJarTest-Lib1</name>
<comment></comment>
<projects>
</projects>
diff --git a/testapps/libsAndJarTest/lib1/project.properties b/testapps/libsAndJarTest/lib1/project.properties
index 36f15941e..480c5b62a 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