diff options
| author | Xavier Ducrohet <xav@android.com> | 2012-06-14 18:50:06 -0700 |
|---|---|---|
| committer | Xavier Ducrohet <xav@android.com> | 2012-06-14 19:26:57 -0700 |
| commit | fcb82e3185d657e3b5440295478cdc58afd168c3 (patch) | |
| tree | b9c618741b2c36cd9529c25364d5814e7403d6ca /testapps/testProjectTest/app | |
| parent | 8c9bfd85c162779a672e36f0a226759f40e4b31f (diff) | |
| download | sdk-fcb82e3185d657e3b5440295478cdc58afd168c3.zip sdk-fcb82e3185d657e3b5440295478cdc58afd168c3.tar.gz sdk-fcb82e3185d657e3b5440295478cdc58afd168c3.tar.bz2 | |
Fix emma for split projects.
The location of the .em file was wrong. Changing its location
means it gets put in the tested project so we need a way to know where
the output of the project is.
As we need to be better at supporting customized projects folder, we
introduce a new task that will be able to look for the customized
path of any projects. So far we only support the output folder
and the source folder.
Change-Id: Id8db82e254baae2088827c96b7719f94c92c927c
Diffstat (limited to 'testapps/testProjectTest/app')
| -rw-r--r-- | testapps/testProjectTest/app/build.xml | 18 | ||||
| -rw-r--r-- | testapps/testProjectTest/app/project.properties | 1 |
2 files changed, 11 insertions, 8 deletions
diff --git a/testapps/testProjectTest/app/build.xml b/testapps/testProjectTest/app/build.xml index a6975a4..1a886ce 100644 --- a/testapps/testProjectTest/app/build.xml +++ b/testapps/testProjectTest/app/build.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project name="LibActivity" default="help"> +<project name="testProjectTest-app" default="help"> <!-- The local.properties file is created and updated by the 'android' tool. It contains the path to the SDK. It should *NOT* be checked into @@ -28,6 +28,15 @@ --> <property file="ant.properties" /> + <!-- if sdk.dir was not set from one of the property file, then + get it from the ANDROID_HOME env var. + This must be done before we load project.properties since + the proguard config can use sdk.dir --> + <property environment="env" /> + <condition property="sdk.dir" value="${env.ANDROID_HOME}"> + <isset property="env.ANDROID_HOME" /> + </condition> + <!-- The project.properties file is created and updated by the 'android' tool, as well as ADT. @@ -39,13 +48,6 @@ application and should be checked into Version Control Systems. --> <loadproperties srcFile="project.properties" /> - <!-- if sdk.dir was not set from one of the property file, then - get it from the ANDROID_HOME env var. --> - <property environment="env" /> - <condition property="sdk.dir" value="${env.ANDROID_HOME}"> - <isset property="env.ANDROID_HOME" /> - </condition> - <!-- quick check on sdk.dir --> <fail message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable." diff --git a/testapps/testProjectTest/app/project.properties b/testapps/testProjectTest/app/project.properties index 60765b6..01b6493 100644 --- a/testapps/testProjectTest/app/project.properties +++ b/testapps/testProjectTest/app/project.properties @@ -13,3 +13,4 @@ # Project target. target=android-15 android.library.reference.1=../lib +manifestmerger.enabled=true |