| Révision | 27cb7e45ee1a7b1e0f5ca80b655178c588e6ec75 (tree) |
|---|---|
| l'heure | 2011-10-22 11:43:16 |
| Auteur | Xavier Ducrohet <xav@andr...> |
| Commiter | Android (Google) Code Review |
Merge "Platform now returns the new location of the renderscript includes."
sdkmanager/libs/sdklib/src/com/android/sdklib/IAndroidTarget.java (diff) sdkmanager/libs/sdklib/src/com/android/sdklib/PlatformTarget.java (diff)| @@ -74,14 +74,18 @@ public interface IAndroidTarget extends Comparable<IAndroidTarget> { | ||
| 74 | 74 | @Deprecated |
| 75 | 75 | public final static int DX = 22; |
| 76 | 76 | /** OS Path to the target's version of the dx.jar file.<br> |
| 77 | - * This is deprecated as dx.jar is now in the platform tools and not in the platform.. */ | |
| 77 | + * This is deprecated as dx.jar is now in the platform tools and not in the platform. */ | |
| 78 | 78 | @Deprecated |
| 79 | 79 | public final static int DX_JAR = 23; |
| 80 | 80 | /** OS Path to the "ant" folder which contains the ant build rules (ver 2 and above) */ |
| 81 | 81 | public final static int ANT = 24; |
| 82 | - /** OS Path to the Renderscript include folder. */ | |
| 82 | + /** OS Path to the Renderscript include folder. | |
| 83 | + * This is deprecated as this is now in the platform tools and not in the platform. */ | |
| 84 | + @Deprecated | |
| 83 | 85 | public final static int ANDROID_RS = 25; |
| 84 | - /** OS Path to the Renderscript(clang) include folder. */ | |
| 86 | + /** OS Path to the Renderscript(clang) include folder. | |
| 87 | + * This is deprecated as this is now in the platform tools and not in the platform. */ | |
| 88 | + @Deprecated | |
| 85 | 89 | public final static int ANDROID_RS_CLANG = 26; |
| 86 | 90 | |
| 87 | 91 | /** |
| @@ -94,8 +94,6 @@ final class PlatformTarget implements IAndroidTarget { | ||
| 94 | 94 | mPaths.put(ANDROID_JAR, mRootFolderOsPath + SdkConstants.FN_FRAMEWORK_LIBRARY); |
| 95 | 95 | mPaths.put(SOURCES, mRootFolderOsPath + SdkConstants.FD_ANDROID_SOURCES); |
| 96 | 96 | mPaths.put(ANDROID_AIDL, mRootFolderOsPath + SdkConstants.FN_FRAMEWORK_AIDL); |
| 97 | - mPaths.put(ANDROID_RS, mRootFolderOsPath + SdkConstants.OS_FRAMEWORK_RS); | |
| 98 | - mPaths.put(ANDROID_RS_CLANG, mRootFolderOsPath + SdkConstants.OS_FRAMEWORK_RS_CLANG); | |
| 99 | 97 | mPaths.put(SAMPLES, mRootFolderOsPath + SdkConstants.OS_PLATFORM_SAMPLES_FOLDER); |
| 100 | 98 | mPaths.put(SKINS, mRootFolderOsPath + SdkConstants.OS_SKINS_FOLDER); |
| 101 | 99 | mPaths.put(TEMPLATES, mRootFolderOsPath + SdkConstants.OS_PLATFORM_TEMPLATES_FOLDER); |
| @@ -128,6 +126,10 @@ final class PlatformTarget implements IAndroidTarget { | ||
| 128 | 126 | SdkConstants.FN_DX); |
| 129 | 127 | mPaths.put(DX_JAR, sdkOsPath + SdkConstants.OS_SDK_PLATFORM_TOOLS_LIB_FOLDER + |
| 130 | 128 | SdkConstants.FN_DX_JAR); |
| 129 | + mPaths.put(ANDROID_RS, sdkOsPath + SdkConstants.OS_SDK_PLATFORM_TOOLS_FOLDER + | |
| 130 | + SdkConstants.OS_FRAMEWORK_RS); | |
| 131 | + mPaths.put(ANDROID_RS_CLANG, sdkOsPath + SdkConstants.OS_SDK_PLATFORM_TOOLS_FOLDER + | |
| 132 | + SdkConstants.OS_FRAMEWORK_RS_CLANG); | |
| 131 | 133 | } |
| 132 | 134 | |
| 133 | 135 | /** |
Android-x86
Fork