From 28265ed42f06418f80925924fddcfee5cea0cc93 Mon Sep 17 00:00:00 2001 From: Piotr Gurgul Date: Tue, 22 Sep 2009 13:58:28 -0700 Subject: [PATCH] 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. --- .../com/android/sdklib/internal/project/ProjectCreator.java | 4 ++++ .../android/sdklib/internal/project/ProjectProperties.java | 2 ++ 2 files changed, 6 insertions(+) diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java index 916fa7c40..3e15e1591 100644 --- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java +++ b/tools/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/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java index 5b35d5019..694e2850c 100644 --- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java +++ b/tools/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),