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

Merge changes 2853,2885 into donut

Browse Source 
* changes:
  Misc updates on the Sdklib.
  Export all ADT packages.
This commit is contained in:
Android (Google) Code Review
2009-06-02 11:56:59 -07:00
parent c825ab1d31 b10ffbaf3d
commit 3c502eb060
3 changed files with 56 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
tools/eclipse/plugins/com.android.ide.eclipse.adt/META-INF/MANIFEST.MF
View File

@@ -47,6 +47,8 @@ Require-Bundle: com.android.ide.eclipse.ddms,
org.eclipse.core.expressions
Eclipse-LazyStart: true
Export-Package: com.android.ide.eclipse.adt;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.actions;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.build;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.editors;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.editors.descriptors;x-friends:="com.android.ide.eclipse.tests",
@@ -69,13 +71,36 @@ Export-Package: com.android.ide.eclipse.adt;x-friends:="com.android.ide.eclipse.
com.android.ide.eclipse.adt.internal.editors.xml;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.editors.xml.descriptors;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.launch;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.launch.junit;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.launch.junit.runtime;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.preferences;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.project;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.properties;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.refactorings.extractstring;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.resources;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.resources.configurations;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.resources.manager;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.resources.manager.files;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.sdk;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.ui;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.wizards.newproject;x-friends:="com.android.ide.eclipse.tests"
com.android.ide.eclipse.adt.internal.wizards.actions;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.wizards.avdmanager;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.wizards.export;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.wizards.newproject;x-friends:="com.android.ide.eclipse.tests",
com.android.ide.eclipse.adt.internal.wizards.newxmlfile;x-friends:="com.android.ide.eclipse.tests",
com.android.jarutils;x-friends:="com.android.ide.eclipse.tests",
com.android.layoutlib.api;x-friends:="com.android.ide.eclipse.tests",
com.android.layoutlib.utils;x-friends:="com.android.ide.eclipse.tests",
com.android.ninepatch;x-friends:="com.android.ide.eclipse.tests",
com.android.prefs;x-friends:="com.android.ide.eclipse.tests",
com.android.sdklib;x-friends:="com.android.ide.eclipse.tests",
com.android.sdklib.internal.avd;x-friends:="com.android.ide.eclipse.tests",
com.android.sdklib.internal.project;x-friends:="com.android.ide.eclipse.tests",
com.android.sdklib.internal.repository;x-friends:="com.android.ide.eclipse.tests",
com.android.sdklib.repository;x-friends:="com.android.ide.eclipse.tests",
com.android.sdkstats;x-friends:="com.android.ide.eclipse.tests",
com.android.sdkuilib;x-friends:="com.android.ide.eclipse.tests",
com.android.sdkuilib.internal.repository;x-friends:="com.android.ide.eclipse.tests",
com.android.sdkuilib.repository;x-friends:="com.android.ide.eclipse.tests"

48
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/IAndroidTarget.java
View File

@@ -24,57 +24,57 @@ package com.android.sdklib;
public interface IAndroidTarget extends Comparable<IAndroidTarget> {
/** OS Path to the "android.jar" file. */
public static int ANDROID_JAR = 1;
public final static int ANDROID_JAR = 1;
/** OS Path to the "framework.aidl" file. */
public static int ANDROID_AIDL = 2;
public final static int ANDROID_AIDL = 2;
/** OS Path to "images" folder which contains the emulator system images. */
public static int IMAGES = 3;
public final static int IMAGES = 3;
/** OS Path to the "samples" folder which contains sample projects. */
public static int SAMPLES = 4;
public final static int SAMPLES = 4;
/** OS Path to the "skins" folder which contains the emulator skins. */
public static int SKINS = 5;
public final static int SKINS = 5;
/** OS Path to the "templates" folder which contains the templates for new projects. */
public static int TEMPLATES = 6;
public final static int TEMPLATES = 6;
/** OS Path to the "data" folder which contains data & libraries for the SDK tools. */
public static int DATA = 7;
public final static int DATA = 7;
/** OS Path to the "attrs.xml" file. */
public static int ATTRIBUTES = 8;
public final static int ATTRIBUTES = 8;
/** OS Path to the "attrs_manifest.xml" file. */
public static int MANIFEST_ATTRIBUTES = 9;
public final static int MANIFEST_ATTRIBUTES = 9;
/** OS Path to the "data/layoutlib.jar" library. */
public static int LAYOUT_LIB = 10;
public final static int LAYOUT_LIB = 10;
/** OS Path to the "data/res" folder. */
public static int RESOURCES = 11;
public final static int RESOURCES = 11;
/** OS Path to the "data/fonts" folder. */
public static int FONTS = 12;
public final static int FONTS = 12;
/** OS Path to the "data/widgets.txt" file. */
public static int WIDGETS = 13;
public final static int WIDGETS = 13;
/** OS Path to the "data/activity_actions.txt" file. */
public static int ACTIONS_ACTIVITY = 14;
public final static int ACTIONS_ACTIVITY = 14;
/** OS Path to the "data/broadcast_actions.txt" file. */
public static int ACTIONS_BROADCAST = 15;
public final static int ACTIONS_BROADCAST = 15;
/** OS Path to the "data/service_actions.txt" file. */
public static int ACTIONS_SERVICE = 16;
public final static int ACTIONS_SERVICE = 16;
/** OS Path to the "data/categories.txt" file. */
public static int CATEGORIES = 17;
public final static int CATEGORIES = 17;
/** OS Path to the "sources" folder. */
public static int SOURCES = 18;
public final static int SOURCES = 18;
/** OS Path to the target specific docs */
public static int DOCS = 19;
public final static int DOCS = 19;
/** OS Path to the target's version of the aapt tool. */
public static int AAPT = 20;
public final static int AAPT = 20;
/** OS Path to the target's version of the aidl tool. */
public static int AIDL = 21;
public final static int AIDL = 21;
/** OS Path to the target's version of the dx too. */
public static int DX = 22;
public final static int DX = 22;
/** OS Path to the target's version of the dx.jar file. */
public static int DX_JAR = 23;
public final static int DX_JAR = 23;
/**
* Return value for {@link #getUsbVendorId()} meaning no USB vendor IDs are defined by the
* Android target.
*/
public static int NO_USB_ID = 0;
public final static int NO_USB_ID = 0;
public interface IOptionalLibrary {
String getName();

13
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkManager.java
View File

@@ -420,13 +420,6 @@ public final class SdkManager {
// get the default skin, or take it from the base platform if needed.
String defaultSkin = propertyMap.get(ADDON_DEFAULT_SKIN);
// get the USB ID (if available)
int usbVendorId = convertId(propertyMap.get(ADDON_USB_VENDOR));
if (usbVendorId != IAndroidTarget.NO_USB_ID) {
target.setUsbVendorId(usbVendorId);
}
if (defaultSkin == null) {
if (skins.length == 1) {
defaultSkin = skins[1];
@@ -435,6 +428,12 @@ public final class SdkManager {
}
}
// get the USB ID (if available)
int usbVendorId = convertId(propertyMap.get(ADDON_USB_VENDOR));
if (usbVendorId != IAndroidTarget.NO_USB_ID) {
target.setUsbVendorId(usbVendorId);
}
target.setSkins(skins, defaultSkin);
return target;