Fix api change following a rebase.

This commit is contained in:
Raphael
2009-06-18 21:42:36 -07:00
parent 3962412784
commit 0d9a6278b4

View File

@@ -17,6 +17,7 @@
package com.android.sdklib.internal.repository; package com.android.sdklib.internal.repository;
import com.android.sdklib.SdkConstants; import com.android.sdklib.SdkConstants;
import com.android.sdklib.SdkManager;
import com.android.sdklib.internal.repository.Archive.Arch; import com.android.sdklib.internal.repository.Archive.Arch;
import com.android.sdklib.internal.repository.Archive.Os; import com.android.sdklib.internal.repository.Archive.Os;
import com.android.sdklib.repository.SdkRepository; import com.android.sdklib.repository.SdkRepository;
@@ -113,10 +114,13 @@ public class ExtraPackage extends Package {
* A "tool" package should always be located in SDK/tools. * A "tool" package should always be located in SDK/tools.
* *
* @param osSdkRoot The OS path of the SDK root folder. * @param osSdkRoot The OS path of the SDK root folder.
* @param suggestedDir A suggestion for the installation folder name, based on the root
* folder used in the zip archive.
* @param sdkManager An existing SDK manager to list current platforms and addons.
* @return A new {@link File} corresponding to the directory to use to install this package. * @return A new {@link File} corresponding to the directory to use to install this package.
*/ */
@Override @Override
public File getInstallFolder(String osSdkRoot) { public File getInstallFolder(String osSdkRoot, String suggestedDir, SdkManager sdkManager) {
return new File(osSdkRoot, getPath()); return new File(osSdkRoot, getPath());
} }