aboutsummaryrefslogtreecommitdiffstats
path: root/sdkmanager
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@android.com>2010-03-18 13:37:06 -0700
committerXavier Ducrohet <xav@android.com>2010-03-18 14:24:49 -0700
commitcd23678486ef1c26e9767ccfcd5e98499bb09e7a (patch)
tree4a3a8f7d0946b7d7443c6011f3f195a2b4aef22a /sdkmanager
parent61942d88200c51d3856ae0d1757acf39db168e26 (diff)
downloadsdk-cd23678486ef1c26e9767ccfcd5e98499bb09e7a.zip
sdk-cd23678486ef1c26e9767ccfcd5e98499bb09e7a.tar.gz
sdk-cd23678486ef1c26e9767ccfcd5e98499bb09e7a.tar.bz2
Add support for the new Ant rules files.
The new Ant rules files are located in <platform>/ant instead of <platform>/templates Also, the name of the file now include the revision number to make it easier to update them, so the custom task must deal with this. Change-Id: I8fff9656b17c5afad8f22b23052dfca4c598d712
Diffstat (limited to 'sdkmanager')
-rw-r--r--sdkmanager/libs/sdklib/src/com/android/sdklib/IAndroidTarget.java2
-rw-r--r--sdkmanager/libs/sdklib/src/com/android/sdklib/PlatformTarget.java1
-rw-r--r--sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java6
3 files changed, 9 insertions, 0 deletions
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/IAndroidTarget.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/IAndroidTarget.java
index b143fb1..1016ba8 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/IAndroidTarget.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/IAndroidTarget.java
@@ -71,6 +71,8 @@ public interface IAndroidTarget extends Comparable<IAndroidTarget> {
public final static int DX = 22;
/** OS Path to the target's version of the dx.jar file. */
public final static int DX_JAR = 23;
+ /** OS Path to the "ant" folder which contains the ant build rules (ver 2 and above) */
+ public final static int ANT = 24;
/**
* Return value for {@link #getUsbVendorId()} meaning no USB vendor IDs are defined by the
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/PlatformTarget.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/PlatformTarget.java
index ed09e5f..4d912b7 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/PlatformTarget.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/PlatformTarget.java
@@ -90,6 +90,7 @@ final class PlatformTarget implements IAndroidTarget {
mPaths.put(DX, mLocation + SdkConstants.OS_SDK_TOOLS_FOLDER + SdkConstants.FN_DX);
mPaths.put(DX_JAR, mLocation + SdkConstants.OS_SDK_TOOLS_LIB_FOLDER +
SdkConstants.FN_DX_JAR);
+ mPaths.put(ANT, mLocation + SdkConstants.OS_PLATFORM_ANT_FOLDER);
}
public String getLocation() {
diff --git a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
index 747081d..d6cf0fc 100644
--- a/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
+++ b/sdkmanager/libs/sdklib/src/com/android/sdklib/SdkConstants.java
@@ -181,6 +181,8 @@ public final class SdkConstants {
public final static String FD_SAMPLES = "samples";
/** Name of the SDK templates folder, i.e. "templates" */
public final static String FD_TEMPLATES = "templates";
+ /** Name of the SDK Ant folder, i.e. "ant" */
+ public final static String FD_ANT = "ant";
/** Name of the SDK data folder, i.e. "data" */
public final static String FD_DATA = "data";
/** Name of the SDK resources folder, i.e. "res" */
@@ -250,6 +252,10 @@ public final class SdkConstants {
* This is an OS path, ending with a separator. */
public final static String OS_PLATFORM_TEMPLATES_FOLDER = FD_TEMPLATES + File.separator;
+ /** Path of the Ant build rules directory relative to a platform folder.
+ * This is an OS path, ending with a separator. */
+ public final static String OS_PLATFORM_ANT_FOLDER = FD_ANT + File.separator;
+
/** Path of the attrs.xml file relative to a platform folder. */
public final static String OS_PLATFORM_ATTRS_XML =
OS_PLATFORM_RESOURCES_FOLDER + FD_VALUES + File.separator + FN_ATTRS_XML;