LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am 07fc39ed: Merge change 26440 into eclair

Browse Source 
Merge commit '07fc39edda5e53bb3ddd980a05ab2c6573685feb' into eclair-plus-aosp

* commit '07fc39edda5e53bb3ddd980a05ab2c6573685feb':
  Add auto-generated tested.project.dir property
This commit is contained in:
Piotr Gurgul
2009-09-22 14:28:51 -07:00
committed by Android Git Automerger
parent a6aae91831 07fc39edda
commit dccc44df44
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java
View File

@@ -203,6 +203,10 @@ public class ProjectCreator {
ProjectProperties buildProperties = ProjectProperties.create(folderPath, ProjectProperties buildProperties = ProjectProperties.create(folderPath,
PropertyType.BUILD); PropertyType.BUILD);
buildProperties.setProperty(ProjectProperties.PROPERTY_APP_PACKAGE, packageName); buildProperties.setProperty(ProjectProperties.PROPERTY_APP_PACKAGE, packageName);
if (isTestProject == true) {
buildProperties.setProperty(ProjectProperties.PROPERTY_TESTED_PROJECT, "..");
}
buildProperties.save(); buildProperties.save();
// create the map for place-holders of values to replace in the templates // create the map for place-holders of values to replace in the templates

2
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectProperties.java
View File

@@ -46,6 +46,8 @@ public final class ProjectProperties {
public final static String PROPERTY_SPLIT_BY_DENSITY = "split.density"; public final static String PROPERTY_SPLIT_BY_DENSITY = "split.density";
public final static String PROPERTY_TESTED_PROJECT = "tested.project.dir";
public static enum PropertyType { public static enum PropertyType {
BUILD("build.properties", BUILD_HEADER), BUILD("build.properties", BUILD_HEADER),
DEFAULT("default.properties", DEFAULT_HEADER), DEFAULT("default.properties", DEFAULT_HEADER),