LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge change Ica46d149 into eclair

Browse Source 
* changes:
  SDK Updater: platform dependency on tools, addon dependency on platform.
This commit is contained in:
Android (Google) Code Review
2009-10-08 15:51:29 -04:00
parent 9cb6feee3a b192b0ef5b
commit 0947e82e4e
16 changed files with 1180 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/AndroidVersion.java
View File

@@ -40,13 +40,14 @@ import java.util.Properties;
public class AndroidVersion {
private static final String PROP_API_LEVEL = "AndroidVersion.ApiLevel"; //$NON-NLS-1$
private static final String PROP_CODENAME = "AndroidVersion.CodeName"; //$NON-NLS-1$
private static final String PROP_CODENAME = "AndroidVersion.CodeName"; //$NON-NLS-1$
private final int mApiLevel;
private final String mCodename;
/**
* Creates an {@link AndroidVersion} with the given api level and codename.
* Codename should be null for a release version, otherwise it's a preview codename.
*/
public AndroidVersion(int apiLevel, String codename) {
mApiLevel = apiLevel;

2
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/AddonPackage.java
View File

@@ -89,6 +89,8 @@ public class AddonPackage extends Package {
* {@link IAndroidTarget#isPlatform()} false) from the {@link SdkManager}.
* This is used to list local SDK folders in which case there is one archive which
* URL is the actual target location.
* <p/>
* By design, this creates a package with one and only one archive.
*/
AddonPackage(IAndroidTarget target, Properties props) {
super( null, //source

2
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/DocPackage.java
View File

@@ -56,6 +56,8 @@ public class DocPackage extends Package {
* Manually create a new package with one archive and the given attributes.
* This is used to create packages from local directories in which case there must be
* one archive which URL is the actual target location.
* <p/>
* By design, this creates a package with one and only one archive.
*/
DocPackage(RepoSource source,
Properties props,

2
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ExtraPackage.java
View File

@@ -72,6 +72,8 @@ public class ExtraPackage extends Package {
* Manually create a new package with one archive and the given attributes or properties.
* This is used to create packages from local directories in which case there must be
* one archive which URL is the actual target location.
* <p/>
* By design, this creates a package with one and only one archive.
*/
ExtraPackage(RepoSource source,
Properties props,

4
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/Package.java
View File

@@ -96,8 +96,10 @@ public abstract class Package implements IDescription {
* Manually create a new package with one archive and the given attributes.
* This is used to create packages from local directories in which case there must be
* one archive which URL is the actual target location.
*
* <p/>
* Properties from props are used first when possible, e.g. if props is non null.
* <p/>
* By design, this creates a package with one and only one archive.
*/
public Package(
RepoSource source,

6
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/PlatformPackage.java
View File

@@ -35,8 +35,8 @@ import java.util.Properties;
*/
public class PlatformPackage extends Package {
private static final String PROP_VERSION = "Platform.Version"; //$NON-NLS-1$
private static final String PROP_MIN_TOOLS_REV = "Platform.MinToolsRev"; //$NON-NLS-1$
protected static final String PROP_VERSION = "Platform.Version"; //$NON-NLS-1$
protected static final String PROP_MIN_TOOLS_REV = "Platform.MinToolsRev"; //$NON-NLS-1$
/** The package version, for platform, add-on and doc packages. */
private final AndroidVersion mVersion;
@@ -80,6 +80,8 @@ public class PlatformPackage extends Package {
* must have {@link IAndroidTarget#isPlatform()} true) from the {@link SdkManager}.
* This is used to list local SDK folders in which case there is one archive which
* URL is the actual target location.
* <p/>
* By design, this creates a package with one and only one archive.
*/
PlatformPackage(IAndroidTarget target, Properties props) {
super( null, //source

2
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/repository/ToolPackage.java
View File

@@ -45,6 +45,8 @@ public class ToolPackage extends Package {
* Manually create a new package with one archive and the given attributes or properties.
* This is used to create packages from local directories in which case there must be
* one archive which URL is the actual target location.
* <p/>
* By design, this creates a package with one and only one archive.
*/
ToolPackage(
RepoSource source,

136
tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/internal/repository/MockAddonPackage.java Executable file
View File

@@ -0,0 +1,136 @@
/*
* Copyright (C) 2009 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.sdklib.internal.repository;
import com.android.sdklib.AndroidVersion;
import com.android.sdklib.IAndroidTarget;
/**
* A mock {@link AddonPackage} for testing.
*
* By design, this package contains one and only one archive.
*/
public class MockAddonPackage extends AddonPackage {
/**
* Creates a {@link MockAddonTarget} with the requested base platform and addon revision
* and then a {@link MockAddonPackage} wrapping it.
*
* By design, this package contains one and only one archive.
*/
public MockAddonPackage(MockPlatformPackage basePlatform, int revision) {
super(new MockAddonTarget(basePlatform.getTarget(), revision), null /*props*/);
}
/**
* A mock AddonTarget.
* This reimplements the minimum needed from the interface for our limited testing needs.
*/
static class MockAddonTarget implements IAndroidTarget {
private final IAndroidTarget mParentTarget;
private final int mRevision;
public MockAddonTarget(IAndroidTarget parentTarget, int revision) {
mParentTarget = parentTarget;
mRevision = revision;
}
public String getClasspathName() {
return null;
}
public String getDefaultSkin() {
return null;
}
public String getDescription() {
return "mock addon target";
}
public String getFullName() {
return "mock addon target";
}
public String getLocation() {
return "";
}
public String getName() {
return "mock addon target";
}
public IOptionalLibrary[] getOptionalLibraries() {
return null;
}
public IAndroidTarget getParent() {
return mParentTarget;
}
public String getPath(int pathId) {
return null;
}
public String[] getPlatformLibraries() {
return null;
}
public int getRevision() {
return mRevision;
}
public String[] getSkins() {
return null;
}
public int getUsbVendorId() {
return 0;
}
public String getVendor() {
return null;
}
public AndroidVersion getVersion() {
return mParentTarget.getVersion();
}
public String getVersionName() {
return String.format("mock-addon-%1$d", getVersion().getApiLevel());
}
public String hashString() {
return getVersionName();
}
/** Returns false for an addon. */
public boolean isPlatform() {
return false;
}
public boolean isCompatibleBaseFor(IAndroidTarget target) {
throw new UnsupportedOperationException("Implement this as needed for tests");
}
public int compareTo(IAndroidTarget o) {
throw new UnsupportedOperationException("Implement this as needed for tests");
}
}
}

169
tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/internal/repository/MockPlatformPackage.java Executable file
View File

@@ -0,0 +1,169 @@
/*
* Copyright (C) 2009 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.sdklib.internal.repository;
import com.android.sdklib.AndroidVersion;
import com.android.sdklib.IAndroidTarget;
import java.util.Properties;
/**
* A mock {@link PlatformPackage} for testing.
*
* By design, this package contains one and only one archive.
*/
public class MockPlatformPackage extends PlatformPackage {
private final IAndroidTarget mTarget;
/**
* Creates a {@link MockPlatformTarget} with the requested API and revision
* and then a {@link MockPlatformPackage} wrapping it.
*
* By design, this package contains one and only one archive.
*/
public MockPlatformPackage(int apiLevel, int revision) {
this(new MockPlatformTarget(apiLevel, revision), null /*props*/);
}
/**
* Creates a {@link MockPlatformTarget} with the requested API and revision
* and then a {@link MockPlatformPackage} wrapping it.
*
* Also sets the min-tools-rev of the platform.
*
* By design, this package contains one and only one archive.
*/
public MockPlatformPackage(int apiLevel, int revision, int min_tools_rev) {
this(new MockPlatformTarget(apiLevel, revision), createProps(min_tools_rev));
}
/** A little trick to be able to capture the target new after passing it to the super. */
private MockPlatformPackage(IAndroidTarget target, Properties props) {
super(target, props);
mTarget = target;
}
private static Properties createProps(int min_tools_rev) {
Properties props = new Properties();
props.setProperty(PlatformPackage.PROP_MIN_TOOLS_REV, Integer.toString((min_tools_rev)));
return props;
}
public IAndroidTarget getTarget() {
return mTarget;
}
/**
* A mock PlatformTarget.
* This reimplements the minimum needed from the interface for our limited testing needs.
*/
static class MockPlatformTarget implements IAndroidTarget {
private final int mApiLevel;
private final int mRevision;
public MockPlatformTarget(int apiLevel, int revision) {
mApiLevel = apiLevel;
mRevision = revision;
}
public String getClasspathName() {
return null;
}
public String getDefaultSkin() {
return null;
}
public String getDescription() {
return "mock platform target";
}
public String getFullName() {
return "mock platform target";
}
public String getLocation() {
return "";
}
public String getName() {
return "mock platform target";
}
public IOptionalLibrary[] getOptionalLibraries() {
return null;
}
public IAndroidTarget getParent() {
return null;
}
public String getPath(int pathId) {
return null;
}
public String[] getPlatformLibraries() {
return null;
}
public int getRevision() {
return mRevision;
}
public String[] getSkins() {
return null;
}
public int getUsbVendorId() {
return 0;
}
public String getVendor() {
return null;
}
public AndroidVersion getVersion() {
return new AndroidVersion(mApiLevel, null /*codename*/);
}
public String getVersionName() {
return String.format("android-%1$d", mApiLevel);
}
public String hashString() {
return getVersionName();
}
/** Returns true for a platform. */
public boolean isPlatform() {
return true;
}
public boolean isCompatibleBaseFor(IAndroidTarget target) {
throw new UnsupportedOperationException("Implement this as needed for tests");
}
public int compareTo(IAndroidTarget o) {
throw new UnsupportedOperationException("Implement this as needed for tests");
}
}
}

48
tools/sdkmanager/libs/sdklib/tests/com/android/sdklib/internal/repository/MockToolPackage.java Executable file
View File

@@ -0,0 +1,48 @@
/*
* Copyright (C) 2009 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.sdklib.internal.repository;
import com.android.sdklib.internal.repository.Archive.Arch;
import com.android.sdklib.internal.repository.Archive.Os;
/**
* A mock {@link ToolPackage} for testing.
*
* By design, this package contains one and only one archive.
*/
public class MockToolPackage extends ToolPackage {
/**
* Creates a {@link MockToolPackage} with the given revision and hardcoded defaults
* for everything else.
* <p/>
* By design, this creates a package with one and only one archive.
*/
public MockToolPackage(int revision) {
super(
null, // source,
null, // props,
revision,
null, // license,
"desc", // description,
"url", // descUrl,
Os.getCurrentOs(), // archiveOs,
Arch.getCurrentArch(), // archiveArch,
"foo" // archiveOsPath
);
}
}