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.

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 (file)
--- 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 (file)
--- 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),