diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:29 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-19 10:57:29 -0800 |
| commit | ff4b5f241f323a335897aff754d144f246caede7 (patch) | |
| tree | b75e7028787f4dbf258ed6e51995726a7862c928 /tools/anttasks | |
| parent | 87a88c4f030dc8d60911ccb236f45d854e89877e (diff) | |
| download | android_development-ff4b5f241f323a335897aff754d144f246caede7.tar.gz android_development-ff4b5f241f323a335897aff754d144f246caede7.tar.bz2 android_development-ff4b5f241f323a335897aff754d144f246caede7.zip | |
auto import from //branches/cupcake/...@132276
Diffstat (limited to 'tools/anttasks')
| -rw-r--r-- | tools/anttasks/src/com/android/ant/AndroidInitTask.java | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/tools/anttasks/src/com/android/ant/AndroidInitTask.java b/tools/anttasks/src/com/android/ant/AndroidInitTask.java index 30779c5da..d5bc55b90 100644 --- a/tools/anttasks/src/com/android/ant/AndroidInitTask.java +++ b/tools/anttasks/src/com/android/ant/AndroidInitTask.java @@ -55,6 +55,12 @@ public class AndroidInitTask extends ImportTask { private final static String PROPERTY_ANDROID_JAR = "android-jar"; // ant property with the path to the framework.jar private final static String PROPERTY_ANDROID_AIDL = "android-aidl"; + // ant property with the path to the aapt tool + private final static String PROPERTY_AAPT = "aapt"; + // ant property with the path to the aidl tool + private final static String PROPERTY_AIDL = "aidl"; + // ant property with the path to the dx tool + private final static String PROPERTY_DX = "dx"; // ref id to the <path> object containing all the boot classpaths. private final static String REF_CLASSPATH = "android.target.classpath"; @@ -122,15 +128,19 @@ public class AndroidInitTask extends ImportTask { System.out.println("Project Target: " + androidTarget.getName()); if (androidTarget.isPlatform() == false) { System.out.println("Vendor: " + androidTarget.getVendor()); + System.out.println("Platform Version: " + androidTarget.getApiVersionName()); } - System.out.println("Platform Version: " + androidTarget.getApiVersionName()); System.out.println("API level: " + androidTarget.getApiVersionNumber()); - // sets up the properties to find android.jar/framework.aidl + // sets up the properties to find android.jar/framework.aidl/target tools String androidJar = androidTarget.getPath(IAndroidTarget.ANDROID_JAR); - String androidAidl = androidTarget.getPath(IAndroidTarget.ANDROID_AIDL); antProject.setProperty(PROPERTY_ANDROID_JAR, androidJar); - antProject.setProperty(PROPERTY_ANDROID_AIDL, androidAidl); + + antProject.setProperty(PROPERTY_ANDROID_AIDL, + androidTarget.getPath(IAndroidTarget.ANDROID_AIDL)); + antProject.setProperty(PROPERTY_AAPT, androidTarget.getPath(IAndroidTarget.AAPT)); + antProject.setProperty(PROPERTY_AIDL, androidTarget.getPath(IAndroidTarget.AIDL)); + antProject.setProperty(PROPERTY_DX, androidTarget.getPath(IAndroidTarget.DX)); // sets up the boot classpath |