From 3af42826295585224775fa95f6071537b8b24f5f Mon Sep 17 00:00:00 2001 From: Xavier Ducrohet Date: Mon, 1 Feb 2010 15:12:56 -0800 Subject: Fix 'android create test-project' to handle parent projects with missing default.prop Bug: 2411562 Change-Id: Ia22491d56dfa3c5dda700782c28a2bcbfeebd266 --- sdkmanager/app/src/com/android/sdkmanager/Main.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'sdkmanager') diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java index 8084693..7f49ea3 100644 --- a/sdkmanager/app/src/com/android/sdkmanager/Main.java +++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java @@ -414,6 +414,12 @@ public class Main { // now get the target hash ProjectProperties p = ProjectProperties.load(parentProject.getAbsolutePath(), PropertyType.DEFAULT); + if (p == null) { + errorAndExit("Unable to load the main project's %1$s", + PropertyType.DEFAULT.getFilename()); + return; + } + String targetHash = p.getProperty(ProjectProperties.PROPERTY_TARGET); if (targetHash == null) { errorAndExit("Couldn't find the main project target"); @@ -511,7 +517,7 @@ public class Main { } if (couldHaveDone) { - mSdkLog.printf("It seems that there are sub-projects. If you want to update them\nplease use the --%1$s parameter.", + mSdkLog.printf("It seems that there are sub-projects. If you want to update them\nplease use the --%1$s parameter.\n", SdkCommandLine.KEY_SUBPROJECTS); } } -- cgit v1.1