Merge "Marking old sdk classes as deprecated" into emu-master-dev
diff --git a/sdklib/src/main/java/com/android/sdklib/SdkManager.java b/sdklib/src/main/java/com/android/sdklib/SdkManager.java
index 91b5703..d33649a 100755
--- a/sdklib/src/main/java/com/android/sdklib/SdkManager.java
+++ b/sdklib/src/main/java/com/android/sdklib/SdkManager.java
@@ -50,6 +50,7 @@
  * @see PlatformTarget
  * @see AddOnTarget
  */
+@Deprecated
 public class SdkManager {
 
     @SuppressWarnings("unused")
diff --git a/sdklib/src/main/java/com/android/sdklib/SystemImage.java b/sdklib/src/main/java/com/android/sdklib/SystemImage.java
index ded928f..89545e2 100755
--- a/sdklib/src/main/java/com/android/sdklib/SystemImage.java
+++ b/sdklib/src/main/java/com/android/sdklib/SystemImage.java
@@ -34,6 +34,7 @@
  * Describes a system image as used by an {@link IAndroidTarget}.
  * A system image has an installation path, a location type, a tag and an ABI type.
  */
+@Deprecated
 public class SystemImage implements ISystemImage {
 
     public static final IdDisplay DEFAULT_TAG = new IdDisplay("default",    //$NON-NLS-1$
diff --git a/sdklib/src/main/java/com/android/sdklib/io/FileOp.java b/sdklib/src/main/java/com/android/sdklib/io/FileOp.java
index fe29e8a..6789f1a 100755
--- a/sdklib/src/main/java/com/android/sdklib/io/FileOp.java
+++ b/sdklib/src/main/java/com/android/sdklib/io/FileOp.java
@@ -39,6 +39,7 @@
  * <p/>
  * This makes it possible to override/mock/stub some file operations in unit tests.
  */
+@Deprecated
 public class FileOp implements IFileOp {
 
     public static final File[] EMPTY_FILE_ARRAY = new File[0];
diff --git a/sdklib/src/main/java/com/android/sdklib/io/IFileOp.java b/sdklib/src/main/java/com/android/sdklib/io/IFileOp.java
index 4ed4ab1..00f073d 100755
--- a/sdklib/src/main/java/com/android/sdklib/io/IFileOp.java
+++ b/sdklib/src/main/java/com/android/sdklib/io/IFileOp.java
@@ -31,6 +31,7 @@
  * <p/>
  * This makes it possible to override/mock/stub some file operations in unit tests.
  */
+@Deprecated
 public interface IFileOp {
 
     /**
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/AddonManifestIniProps.java b/sdklib/src/main/java/com/android/sdklib/repository/AddonManifestIniProps.java
index de82b2e..d94cffc 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/AddonManifestIniProps.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/AddonManifestIniProps.java
@@ -23,6 +23,7 @@
  * Once published we can't change them arbitrarily since various parts

  * of our build process depend on them.

  */

+@Deprecated

 public class AddonManifestIniProps {

 

     /**

diff --git a/sdklib/src/main/java/com/android/sdklib/repository/FullRevision.java b/sdklib/src/main/java/com/android/sdklib/repository/FullRevision.java
index e71499f..52466d4 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/FullRevision.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/FullRevision.java
@@ -30,6 +30,7 @@
  *
  *  @see MajorRevision
  */
+@Deprecated
 public class FullRevision implements Comparable<FullRevision> {
 
     public static final int MISSING_MAJOR_REV  = 0;
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/IDescription.java b/sdklib/src/main/java/com/android/sdklib/repository/IDescription.java
index 1e44964..49377e3 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/IDescription.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/IDescription.java
@@ -19,6 +19,7 @@
 /**
  * Interface for elements that can provide a description of themselves.
  */
+@Deprecated
 public interface IDescription {
 
     /**
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/IListDescription.java b/sdklib/src/main/java/com/android/sdklib/repository/IListDescription.java
index c3ae365..2b1188a 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/IListDescription.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/IListDescription.java
@@ -19,6 +19,7 @@
 /**
  * Interface for elements that can provide a description of themselves.
  */
+@Deprecated
 public interface IListDescription {
 
     /**
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/ISdkChangeListener.java b/sdklib/src/main/java/com/android/sdklib/repository/ISdkChangeListener.java
index 5c0cab8..80ee048 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/ISdkChangeListener.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/ISdkChangeListener.java
@@ -22,6 +22,7 @@
  * This notifies when the SDK manager is first loading the SDK or before/after it installed
  * a package.
  */
+@Deprecated
 public interface ISdkChangeListener {
     /**
      * Invoked when the content of the SDK is being loaded by the SDK Manager UI
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/License.java b/sdklib/src/main/java/com/android/sdklib/repository/License.java
index 7040ec1..e8bfed2 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/License.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/License.java
@@ -31,6 +31,7 @@
 /**
  * License text, with an optional license XML reference.
  */
+@Deprecated
 public class License {
     private final String mLicense;
     private final String mLicenseRef;
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/MajorRevision.java b/sdklib/src/main/java/com/android/sdklib/repository/MajorRevision.java
index b6d2557..e541337 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/MajorRevision.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/MajorRevision.java
@@ -26,6 +26,7 @@
  * provide minor, micro and preview revision numbers -- these are all
  * set to zero.
  */
+@Deprecated
 public class MajorRevision extends FullRevision {
 
     public MajorRevision(FullRevision fullRevision) {
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/NoPreviewRevision.java b/sdklib/src/main/java/com/android/sdklib/repository/NoPreviewRevision.java
index 0280cb2..08cc68d 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/NoPreviewRevision.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/NoPreviewRevision.java
@@ -25,6 +25,7 @@
  *
  *  @see FullRevision
  */
+@Deprecated
 public class NoPreviewRevision extends FullRevision {
 
     public NoPreviewRevision(int major) {
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/PreciseRevision.java b/sdklib/src/main/java/com/android/sdklib/repository/PreciseRevision.java
index 81e9744..200e407 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/PreciseRevision.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/PreciseRevision.java
@@ -25,6 +25,7 @@
  * This is vital when referencing Gradle artifact numbers,
  * since versions x.y.0 and version x.y are not the same.
  */
+@Deprecated
 public class PreciseRevision extends FullRevision {
     private final int mPrecision;
 
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/RepoXsdUtil.java b/sdklib/src/main/java/com/android/sdklib/repository/RepoXsdUtil.java
index 805fa8a..dcd7963 100644
--- a/sdklib/src/main/java/com/android/sdklib/repository/RepoXsdUtil.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/RepoXsdUtil.java
@@ -35,6 +35,7 @@
 /**
  * Utilities related to the respository XSDs.
  */
+@Deprecated
 public class RepoXsdUtil {
 
     public static final String NODE_IMPORT = "import";
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgCapabilities.java b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgCapabilities.java
index b481e6a..dd2e3e7 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgCapabilities.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgCapabilities.java
@@ -29,6 +29,7 @@
  * @see PkgType
  * @see PkgDesc
  */
+@Deprecated
 public interface IPkgCapabilities {
 
     /**
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgDesc.java b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgDesc.java
index 5effda3..babc221 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgDesc.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgDesc.java
@@ -39,6 +39,7 @@
  * To query packages capabilities, rely on {@link #getType()} and the {@code IPkgDesc.hasXxx()}
  * methods provided by {@link IPkgDesc}.
  */
+@Deprecated
 public interface IPkgDesc extends Comparable<IPkgDesc>, IPkgCapabilities, IListDescription {
 
     /**
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgDescAddon.java b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgDescAddon.java
index 02c0ad5..baaf5c5 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgDescAddon.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgDescAddon.java
@@ -30,6 +30,7 @@
  * To query generic packages capabilities, rely on {@link #getType()} and the
  * {@code IPkgDesc.hasXxx()} methods provided by {@link IPkgDesc}.
  */
+@Deprecated
 public interface IPkgDescAddon extends IPkgDesc {
 
     /**
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgDescExtra.java b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgDescExtra.java
index 68c4bd7..af99b8f 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgDescExtra.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IPkgDescExtra.java
@@ -35,6 +35,7 @@
  * To query generic packages capabilities, rely on {@link #getType()} and the
  * {@code IPkgDesc.hasXxx()} methods provided by {@link IPkgDesc}.
  */
+@Deprecated
 public interface IPkgDescExtra extends IPkgDesc {
     /**
      * Returns an optional list of older paths for this extra package.
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IdDisplay.java b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IdDisplay.java
index 0278ba5..3a9a0d4 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IdDisplay.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/IdDisplay.java
@@ -21,6 +21,7 @@
 /**
  * Immutable structure that represents a tuple (id-string  + display-string.)
  */
+@Deprecated
 public final class IdDisplay implements Comparable<IdDisplay> {
 
     private final String mId;
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgDesc.java b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgDesc.java
index 6c1e152..10c39ab 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgDesc.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgDesc.java
@@ -46,6 +46,7 @@
  * To query packages capabilities, rely on {@link #getType()} and the {@code PkgDesc.hasXxx()}
  * methods provided in the base {@link PkgDesc}.
  */
+@Deprecated
 public class PkgDesc implements IPkgDesc {
     public static final String PREVIEW_SUFFIX = "-preview";
     private final PkgType mType;
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgDescAddon.java b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgDescAddon.java
index 9694d1f..8adb271 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgDescAddon.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgDescAddon.java
@@ -28,6 +28,7 @@
  * Do not use this class directly.
  * To create an instance use {@link PkgDesc.Builder#newAddon} instead.
  */
+@Deprecated
 final class PkgDescAddon extends PkgDesc implements IPkgDescAddon {
 
     private final IdDisplay mAddonName;
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgDescExtra.java b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgDescExtra.java
index b5f2efb..bd13f48 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgDescExtra.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgDescExtra.java
@@ -26,6 +26,7 @@
 /**
  * Implementation detail of {@link IPkgDescExtra} for extra packages.
  */
+@Deprecated
 public final class PkgDescExtra extends PkgDesc implements IPkgDescExtra {
 
     private final String[] mOldPaths;
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgType.java b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgType.java
index 9f0ccc2..a85a160 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgType.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/descriptors/PkgType.java
@@ -33,6 +33,7 @@
  * compatibility with the older {@link LocalSdkParser} class.
  * The integer bit values also indicate the natural ordering of the packages.
  */
+@Deprecated
 public enum PkgType implements IPkgCapabilities {
 
     // Boolean attributes below, in that order:
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalAddonPkgInfo.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalAddonPkgInfo.java
index 7dda921..f27ca75 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalAddonPkgInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalAddonPkgInfo.java
@@ -45,6 +45,7 @@
 import java.util.regex.Pattern;
 
 @SuppressWarnings("MethodMayBeStatic")
+@Deprecated
 public class LocalAddonPkgInfo extends LocalPlatformPkgInfo {
 
     private static final Pattern PATTERN_LIB_DATA = Pattern.compile(
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalAddonSysImgPkgInfo.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalAddonSysImgPkgInfo.java
index e02c8e9..9d3bcca 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalAddonSysImgPkgInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalAddonSysImgPkgInfo.java
@@ -34,6 +34,7 @@
  * The package itself has a major revision.
  * There should be only one for a given android platform version & ABI.
  */
+@Deprecated
 public class LocalAddonSysImgPkgInfo extends LocalPkgInfo {
 
 
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalBuildToolPkgInfo.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalBuildToolPkgInfo.java
index 0251cc3..08cf214 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalBuildToolPkgInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalBuildToolPkgInfo.java
@@ -26,6 +26,7 @@
 import java.io.File;
 import java.util.Properties;
 
+@Deprecated
 public class LocalBuildToolPkgInfo extends LocalPkgInfo {
 
 
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalDirInfo.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalDirInfo.java
index 7e3a791..cbd2549 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalDirInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalDirInfo.java
@@ -46,6 +46,7 @@
  * into a map and still call {@link Map#containsKey(Object)} with a File
  * object to check whether there's a corresponding DirInfo in the map.
  */
+@Deprecated
 class LocalDirInfo {
     @NonNull
     private final IFileOp mFileOp;
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalDocPkgInfo.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalDocPkgInfo.java
index 004f450..1d0c803 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalDocPkgInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalDocPkgInfo.java
@@ -25,6 +25,7 @@
 import java.io.File;
 import java.util.Properties;
 
+@Deprecated
 public class LocalDocPkgInfo extends LocalPkgInfo {
 
     @NonNull
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalExtraPkgInfo.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalExtraPkgInfo.java
index 5ec811b..12a452b 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalExtraPkgInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalExtraPkgInfo.java
@@ -27,6 +27,7 @@
 import java.io.File;
 import java.util.Properties;
 
+@Deprecated
 public class LocalExtraPkgInfo extends LocalPkgInfo {
 
     @NonNull
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalNdkPkgInfo.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalNdkPkgInfo.java
index 8858300..7929f7a 100644
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalNdkPkgInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalNdkPkgInfo.java
@@ -27,6 +27,7 @@
 /**
  * Local package representing the Android NDK
  */
+@Deprecated
 public class LocalNdkPkgInfo extends LocalPkgInfo {
   @NonNull
   private final IPkgDesc mDesc;
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalPkgInfo.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalPkgInfo.java
index 4bdc308..b66a750 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalPkgInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalPkgInfo.java
@@ -34,6 +34,7 @@
  * Instead please use the {@link LocalSdk} methods to parse and retrieve packages.
  * <p/>
  */
+@Deprecated
 public abstract class LocalPkgInfo
         implements IDescription, IListDescription, Comparable<LocalPkgInfo> {
 
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalPlatformPkgInfo.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalPlatformPkgInfo.java
index 534677e..b331694 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalPlatformPkgInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalPlatformPkgInfo.java
@@ -62,6 +62,7 @@
 import java.util.TreeSet;
 
 @SuppressWarnings("ConstantConditions")
+@Deprecated
 public class LocalPlatformPkgInfo extends LocalPkgInfo {
 
     public static final String PROP_VERSION_SDK      = "ro.build.version.sdk";      //$NON-NLS-1$
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalPlatformToolPkgInfo.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalPlatformToolPkgInfo.java
index 281c64e..0e74e2a 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalPlatformToolPkgInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalPlatformToolPkgInfo.java
@@ -24,6 +24,7 @@
 import java.io.File;
 import java.util.Properties;
 
+@Deprecated
 public class LocalPlatformToolPkgInfo extends LocalPkgInfo {
 
     @NonNull
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSamplePkgInfo.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSamplePkgInfo.java
index d8159d6..eb0be14 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSamplePkgInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSamplePkgInfo.java
@@ -31,6 +31,7 @@
  * The package itself has a major revision.
  * There should be only one for a given android platform version.
  */
+@Deprecated
 public class LocalSamplePkgInfo extends LocalPkgInfo {
 
     @NonNull
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSdk.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSdk.java
index 144ed5b..b58eac1 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSdk.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSdk.java
@@ -158,6 +158,7 @@
  * </ul>
  * @version 2 of the {@code SdkManager} class, essentially.
  */
+@Deprecated
 public class LocalSdk {
 
     /** Location of the SDK. Maybe null. Can be changed. */
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSourcePkgInfo.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSourcePkgInfo.java
index eb822de..33a0c91 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSourcePkgInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSourcePkgInfo.java
@@ -30,6 +30,7 @@
  * The package itself has a major revision.
  * There should be only one for a given android platform version.
  */
+@Deprecated
 public class LocalSourcePkgInfo extends LocalPkgInfo {
 
     @NonNull
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSysImgPkgInfo.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSysImgPkgInfo.java
index f9e8148..2903dea 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSysImgPkgInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalSysImgPkgInfo.java
@@ -44,6 +44,7 @@
  * The package itself has a major revision.
  * There should be only one for a given android platform version & ABI.
  */
+@Deprecated
 public class LocalSysImgPkgInfo extends LocalPkgInfo {
 
 
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalToolPkgInfo.java b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalToolPkgInfo.java
index 91306ea..6353527 100755
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/LocalToolPkgInfo.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/LocalToolPkgInfo.java
@@ -24,6 +24,7 @@
 import java.io.File;
 import java.util.Properties;
 
+@Deprecated
 public class LocalToolPkgInfo extends LocalPkgInfo {
 
     @NonNull
diff --git a/sdklib/src/main/java/com/android/sdklib/repository/local/PackageParserUtils.java b/sdklib/src/main/java/com/android/sdklib/repository/local/PackageParserUtils.java
index e8cc4b2..24efcf8 100644
--- a/sdklib/src/main/java/com/android/sdklib/repository/local/PackageParserUtils.java
+++ b/sdklib/src/main/java/com/android/sdklib/repository/local/PackageParserUtils.java
@@ -33,6 +33,7 @@
 /**
  * Misc utilities to help extracting elements and attributes out of a repository XML document.
  */
+@Deprecated
 class PackageParserUtils {
   /**
    * Utility method to parse the {@link PkgProps#PKG_REVISION} property as a full