From 0d9a6278b47f994d5f9556e13e7fd7887a87228b Mon Sep 17 00:00:00 2001 From: Raphael Date: Thu, 18 Jun 2009 21:42:36 -0700 Subject: [PATCH] Fix api change following a rebase. --- .../src/com/android/sdklib/internal/repository/ExtraPackage.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ExtraPackage.java b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ExtraPackage.java index efa69311..9cd602c8 100755 --- a/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ExtraPackage.java +++ b/tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ExtraPackage.java @@ -17,6 +17,7 @@ package com.android.sdklib.internal.repository; 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.Os; 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. * * @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. */ @Override - public File getInstallFolder(String osSdkRoot) { + public File getInstallFolder(String osSdkRoot, String suggestedDir, SdkManager sdkManager) { return new File(osSdkRoot, getPath()); } -- 2.11.0