aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager
diff options
context:
space:
mode:
authorPiotr Gurgul <pgurgul@google.com>2009-09-22 13:58:28 -0700
committerPiotr Gurgul <pgurgul@google.com>2009-09-22 13:58:28 -0700
commit6b17264f7af10266a12181e051aca4e05596d1ce (patch)
tree40cd17313dc702c9f4da5ddb34a4e51df9c53ffd /sdkmanager
parent567e604060b9150212e8dc1570ae762bac269ac3 (diff)
downloadsdk-6b17264f7af10266a12181e051aca4e05596d1ce.zip
sdk-6b17264f7af10266a12181e051aca4e05596d1ce.tar.gz
sdk-6b17264f7af10266a12181e051aca4e05596d1ce.tar.bz2
Add auto-generated tested.project.dir property
Adds tested.project.dir=".." to ProjectDir/tests/build.properties in order to indicate automatically that this is a test project and point the tested project directory.
Diffstat (limited to 'sdkmanager')
-rw-r--r--sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java4
-rw-r--r--sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java2
2 files changed, 6 insertions, 0 deletions
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java
index 916fa7c..3e15e15 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java
@@ -203,6 +203,10 @@ public class ProjectCreator {
ProjectProperties buildProperties = ProjectProperties.create(folderPath,
PropertyType.BUILD);
buildProperties.setProperty(ProjectProperties.PROPERTY_APP_PACKAGE, packageName);
+ if (isTestProject == true) {
+ buildProperties.setProperty(ProjectProperties.PROPERTY_TESTED_PROJECT, "..");
+ }
+
buildProperties.save();
// create the map for place-holders of values to replace in the templates
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java
index 5b35d50..694e285 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java
@@ -46,6 +46,8 @@ public final class ProjectProperties {
public final static String PROPERTY_SPLIT_BY_DENSITY = "split.density";
+ public final static String PROPERTY_TESTED_PROJECT = "tested.project.dir";
+
public static enum PropertyType {
BUILD("build.properties", BUILD_HEADER),
DEFAULT("default.properties", DEFAULT_HEADER),