diff options
| author | Raphael <raphael@google.com> | 2010-03-06 19:54:27 -0800 |
|---|---|---|
| committer | Raphael <raphael@google.com> | 2010-03-08 11:01:18 -0800 |
| commit | f59560335277e4dd69b2426d917cfbdefff6513a (patch) | |
| tree | e48ff8b6c18a9d7aed89a572b2af3e5bf5a0c37b | |
| parent | e1de67d34a5a896a936307a67f1308a993ed2013 (diff) | |
| download | sdk-f59560335277e4dd69b2426d917cfbdefff6513a.zip sdk-f59560335277e4dd69b2426d917cfbdefff6513a.tar.gz sdk-f59560335277e4dd69b2426d917cfbdefff6513a.tar.bz2 | |
SDK Manager recomputes addon install folder name.
SDK Bug 2277349
Change-Id: I1d7412deeda45c8a85072a7ee8d371b5bee6a9a0
| -rwxr-xr-x | sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonPackage.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonPackage.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonPackage.java index 4055cbc..8bdd260 100755 --- a/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonPackage.java +++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonPackage.java @@ -256,17 +256,13 @@ public class AddonPackage extends Package }
}
- // Otherwise, see about reusing the suggestedDir. It must not be already used or
- // add some index to it, or we try to make up one.
- String name = suggestedDir;
-
- if (suggestedDir == null || suggestedDir.length() == 0) {
- name = String.format("addon-%s-%s-%s", getName(), getVendor(), //$NON-NLS-1$
- mVersion.getApiString());
- name = name.toLowerCase();
- name = name.replaceAll("[^a-z0-9_-]+", "_"); //$NON-NLS-1$ //$NON-NLS-2$
- name = name.replaceAll("_+", "_"); //$NON-NLS-1$ //$NON-NLS-2$
- }
+ // Compute a folder directory using the addon declared name and vendor strings.
+ // This purposedly ignores the suggestedDir.
+ String name = String.format("addon_%s_%s_%s", //$NON-NLS-1$
+ getName(), getVendor(), mVersion.getApiString());
+ name = name.toLowerCase();
+ name = name.replaceAll("[^a-z0-9_-]+", "_"); //$NON-NLS-1$ //$NON-NLS-2$
+ name = name.replaceAll("_+", "_"); //$NON-NLS-1$ //$NON-NLS-2$
for (int i = 0; i < 100; i++) {
String name2 = i == 0 ? name : String.format("%s-%d", name, i); //$NON-NLS-1$
|