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

am a16a134a: am 5d2a01ad: Merge change I235da4a8 into eclair-sdk

Browse Source 
Merge commit 'a16a134a865b4e894c6667cb5b6d9e635baa53f2' into eclair-mr2

* commit 'a16a134a865b4e894c6667cb5b6d9e635baa53f2':
  SDK android "update project" must not require --target parameter.
This commit is contained in:
Raphael
2009-10-22 11:31:41 -07:00
committed by Android Git Automerger
parent 6ec0e33eeb a16a134a86
commit 1a0b151ce6
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
tools/sdkmanager/app/src/com/android/sdkmanager/Main.java
View File

@@ -291,11 +291,11 @@ public class Main {
// get the target and try to resolve it. // get the target and try to resolve it.
int targetId = resolveTargetName(mSdkCommandLine.getParamTargetId()); int targetId = resolveTargetName(mSdkCommandLine.getParamTargetId());
IAndroidTarget[] targets = mSdkManager.getTargets(); IAndroidTarget[] targets = mSdkManager.getTargets();
if (targetId < 1 || targetId > targets.length) { if (targetId == INVALID_TARGET_ID || targetId > targets.length) {
errorAndExit("Target id is not valid. Use '%s list targets' to get the target ids.", errorAndExit("Target id is not valid. Use '%s list targets' to get the target ids.",
SdkConstants.androidCmdName()); SdkConstants.androidCmdName());
} }
IAndroidTarget target = targets[targetId - 1]; IAndroidTarget target = targets[targetId - 1]; // target id is 1-based
ProjectCreator creator = new ProjectCreator(mOsSdkFolder, ProjectCreator creator = new ProjectCreator(mOsSdkFolder,
mSdkCommandLine.isVerbose() ? OutputLevel.VERBOSE : mSdkCommandLine.isVerbose() ? OutputLevel.VERBOSE :
@@ -462,14 +462,18 @@ public class Main {
private void updateProject() { private void updateProject() {
// get the target and try to resolve it. // get the target and try to resolve it.
IAndroidTarget target = null; IAndroidTarget target = null;
int targetId = resolveTargetName(mSdkCommandLine.getParamTargetId()); String targetStr = mSdkCommandLine.getParamTargetId();
if (targetId >= 0) { // For "update project" the target parameter is optional so having null is acceptable.
// However if there's a value, it must be valid.
if (targetStr != null) {
IAndroidTarget[] targets = mSdkManager.getTargets(); IAndroidTarget[] targets = mSdkManager.getTargets();
if (targetId < 1 || targetId > targets.length) { int targetId = resolveTargetName(targetStr);
errorAndExit("Target id is not valid. Use '%s list targets' to get the target ids.", if (targetId == INVALID_TARGET_ID || targetId > targets.length) {
errorAndExit("Target id '%1$s' is not valid. Use '%2$s list targets' to get the target ids.",
targetStr,
SdkConstants.androidCmdName()); SdkConstants.androidCmdName());
} }
target = targets[targetId - 1]; target = targets[targetId - 1]; // target id is 1-based
} }
ProjectCreator creator = new ProjectCreator(mOsSdkFolder, ProjectCreator creator = new ProjectCreator(mOsSdkFolder,
@@ -715,15 +719,15 @@ public class Main {
private void createAvd() { private void createAvd() {
// find a matching target // find a matching target
int targetId = resolveTargetName(mSdkCommandLine.getParamTargetId()); int targetId = resolveTargetName(mSdkCommandLine.getParamTargetId());
IAndroidTarget target = null; IAndroidTarget[] targets = mSdkManager.getTargets();
if (targetId >= 1 && targetId <= mSdkManager.getTargets().length) { if (targetId == INVALID_TARGET_ID || targetId > targets.length) {
target = mSdkManager.getTargets()[targetId-1]; // target it is 1-based
} else {
errorAndExit("Target id is not valid. Use '%s list targets' to get the target ids.", errorAndExit("Target id is not valid. Use '%s list targets' to get the target ids.",
SdkConstants.androidCmdName()); SdkConstants.androidCmdName());
} }
IAndroidTarget target = targets[targetId-1]; // target id is 1-based
try { try {
boolean removePrevious = mSdkCommandLine.getFlagForce(); boolean removePrevious = mSdkCommandLine.getFlagForce();
AvdManager avdManager = new AvdManager(mSdkManager, mSdkLog); AvdManager avdManager = new AvdManager(mSdkManager, mSdkLog);