diff options
| author | Xavier Ducrohet <xav@google.com> | 2015-05-01 16:35:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-05-01 16:35:12 +0000 |
| commit | 5d0c098d35a41abbf418aa95a8d43649a93ea0a4 (patch) | |
| tree | 6968c1a696a162bcfa4856abd9e98f0da03af215 | |
| parent | 82a5e63364783aa51c733065a0e7938edff51178 (diff) | |
| parent | 020a8744f5d0cf233c75cd19fee2961ad30a576f (diff) | |
| download | swt-5d0c098d35a41abbf418aa95a8d43649a93ea0a4.tar.gz | |
Merge "update sdkmanager main to match new API." into studio-1.3-dev automerge: 78e0276
automerge: 020a874
* commit '020a8744f5d0cf233c75cd19fee2961ad30a576f':
update sdkmanager main to match new API.
| -rw-r--r-- | sdkmanager/app/src/main/java/com/android/sdkmanager/Main.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sdkmanager/app/src/main/java/com/android/sdkmanager/Main.java b/sdkmanager/app/src/main/java/com/android/sdkmanager/Main.java index 7f21004..d6b93b1 100644 --- a/sdkmanager/app/src/main/java/com/android/sdkmanager/Main.java +++ b/sdkmanager/app/src/main/java/com/android/sdkmanager/Main.java @@ -25,7 +25,7 @@ import com.android.io.FileWrapper; import com.android.prefs.AndroidLocation; import com.android.prefs.AndroidLocation.AndroidLocationException; import com.android.sdklib.IAndroidTarget; -import com.android.sdklib.IAndroidTarget.IOptionalLibrary; +import com.android.sdklib.IAndroidTarget.OptionalLibrary; import com.android.sdklib.ISystemImage; import com.android.sdklib.SdkManager; import com.android.sdklib.SystemImage; @@ -58,6 +58,7 @@ import com.android.utils.ILogger; import com.android.utils.IReaderLogger; import com.android.utils.Pair; import com.android.xml.AndroidXPathFactory; +import com.google.common.collect.ImmutableList; import org.eclipse.swt.widgets.Display; import org.xml.sax.InputSource; @@ -993,12 +994,12 @@ public class Main { target.getVersionName(), target.getVersion().getApiString()); // display the optional libraries. - IOptionalLibrary[] libraries = target.getOptionalLibraries(); - if (libraries != null) { + List<OptionalLibrary> libraries = target.getAdditionalLibraries(); + if (!libraries.isEmpty()) { mSdkLog.info(" Libraries:\n"); - for (IOptionalLibrary library : libraries) { + for (OptionalLibrary library : libraries) { mSdkLog.info(" * %1$s (%2$s)\n", - library.getName(), library.getJarName()); + library.getName(), library.getJar().getName()); mSdkLog.info(" %1$s\n", library.getDescription()); } } |