diff options
| author | Xavier Ducrohet <xav@android.com> | 2010-05-13 16:07:21 -0700 |
|---|---|---|
| committer | Android Code Review <code-review@android.com> | 2010-05-13 16:07:21 -0700 |
| commit | 1e3679a5c7edeab8890f0a3314b587ffceb9a5ec (patch) | |
| tree | a2ab7248db56ec744bca3f2df2be7c26c4ec280b | |
| parent | 33cd68773864e63d64a1f524105c08afec56ebf1 (diff) | |
| parent | 1161bc7d9fa53e34bd9fa03a58420d89f8528707 (diff) | |
| download | sdk-1e3679a5c7edeab8890f0a3314b587ffceb9a5ec.zip sdk-1e3679a5c7edeab8890f0a3314b587ffceb9a5ec.tar.gz sdk-1e3679a5c7edeab8890f0a3314b587ffceb9a5ec.tar.bz2 | |
Merge "Disable --library for 'update lib-project'"
| -rw-r--r-- | sdkmanager/app/src/com/android/sdkmanager/Main.java | 4 | ||||
| -rw-r--r-- | sdkmanager/app/src/com/android/sdkmanager/SdkCommandLine.java | 4 |
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 |