aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager/app
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2010-05-13 16:06:32 -0700
committerXavier Ducrohet <xav@android.com>2010-05-13 16:06:32 -0700
commit1161bc7d9fa53e34bd9fa03a58420d89f8528707 (patch)
tree9ec8e6230a93c3b2bf77ea97c2d7fa07318ac56a /sdkmanager/app
parentd8d3dc7e015cb7e17fdad0ab520041b4ffcd3e84 (diff)
downloadsdk-1161bc7d9fa53e34bd9fa03a58420d89f8528707.zip
sdk-1161bc7d9fa53e34bd9fa03a58420d89f8528707.tar.gz
sdk-1161bc7d9fa53e34bd9fa03a58420d89f8528707.tar.bz2
Disable --library for 'update lib-project'
Change-Id: I44f612595750ff0b0248f0206456dcf2f53bcf47
Diffstat (limited to 'sdkmanager/app')
-rw-r--r--sdkmanager/app/src/com/android/sdkmanager/Main.java4
-rw-r--r--sdkmanager/app/src/com/android/sdkmanager/SdkCommandLine.java4
2 files changed, 2 insertions, 6 deletions
diff --git a/sdkmanager/app/src/com/android/sdkmanager/Main.java b/sdkmanager/app/src/com/android/sdkmanager/Main.java
index 49eee7e..f0baa31 100644
--- a/sdkmanager/app/src/com/android/sdkmanager/Main.java
+++ b/sdkmanager/app/src/com/android/sdkmanager/Main.java
@@ -503,8 +503,8 @@ public class Main {
String projectDir = getProjectLocation(mSdkCommandLine.getParamLocationPath());
- String libraryPath = mSdkCommandLine.getParamProjectLibrary(
- library ? SdkCommandLine.OBJECT_LIB_PROJECT : SdkCommandLine.OBJECT_PROJECT);
+ String libraryPath = library ? null :
+ mSdkCommandLine.getParamProjectLibrary(SdkCommandLine.OBJECT_PROJECT);
creator.updateProject(projectDir,
target,
diff --git a/sdkmanager/app/src/com/android/sdkmanager/SdkCommandLine.java b/sdkmanager/app/src/com/android/sdkmanager/SdkCommandLine.java
index bbeb1f6..9b1425e 100644
--- a/sdkmanager/app/src/com/android/sdkmanager/SdkCommandLine.java
+++ b/sdkmanager/app/src/com/android/sdkmanager/SdkCommandLine.java
@@ -274,10 +274,6 @@ class SdkCommandLine extends CommandLineProcessor {
VERB_UPDATE, OBJECT_LIB_PROJECT,
"t", KEY_TARGET_ID,
"Target id to set for the project", null);
- define(Mode.STRING, false,
- VERB_UPDATE, OBJECT_LIB_PROJECT,
- "l", KEY_LIBRARY,
- "Location path of an Android Library to add, relative to the main project", null);
}
@Override