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

Make sure older rules files can find the SDK Location.

Browse Source 
Change-Id: Idb2463f07c233015927181e79955ae71e10dcb19
This commit is contained in:
Xavier Ducrohet
2009-08-25 18:11:28 -07:00
parent 2de4241074
commit 6e0e018751
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/anttasks/src/com/android/ant/SetupTask.java
View File

@@ -87,6 +87,9 @@ public final class SetupTask extends ImportTask {
// check if it's valid and exists // check if it's valid and exists
if (sdkLocation == null || sdkLocation.length() == 0) { if (sdkLocation == null || sdkLocation.length() == 0) {
// LEGACY support: project created with 1.6 or before may be using a different
// property to declare the location of the SDK. At this point, we cannot
// yet check which target is running so we check both always.
sdkLocation = antProject.getProperty(ProjectProperties.PROPERTY_SDK_LEGACY); sdkLocation = antProject.getProperty(ProjectProperties.PROPERTY_SDK_LEGACY);
if (sdkLocation == null || sdkLocation.length() == 0) { if (sdkLocation == null || sdkLocation.length() == 0) {
throw new BuildException("SDK Location is not set."); throw new BuildException("SDK Location is not set.");
@@ -196,10 +199,12 @@ public final class SetupTask extends ImportTask {
// find the file to import, and import it. // find the file to import, and import it.
String templateFolder = androidTarget.getPath(IAndroidTarget.TEMPLATES); String templateFolder = androidTarget.getPath(IAndroidTarget.TEMPLATES);
// legacy support // LEGACY support. android_rules.xml in older platforms expects properties with
// older names. This sets those properties to make sure the rules will work.
if (androidTarget.getVersion().getApiLevel() <= 4) { // 1.6 and earlier if (androidTarget.getVersion().getApiLevel() <= 4) { // 1.6 and earlier
antProject.setProperty(PROPERTY_ANDROID_JAR_LEGACY, androidJar); antProject.setProperty(PROPERTY_ANDROID_JAR_LEGACY, androidJar);
antProject.setProperty(PROPERTY_ANDROID_AIDL_LEGACY, androidAidl); antProject.setProperty(PROPERTY_ANDROID_AIDL_LEGACY, androidAidl);
antProject.setProperty(ProjectProperties.PROPERTY_SDK_LEGACY, sdkLocation);
String appPackage = antProject.getProperty(ProjectProperties.PROPERTY_APP_PACKAGE); String appPackage = antProject.getProperty(ProjectProperties.PROPERTY_APP_PACKAGE);
if (appPackage != null && appPackage.length() > 0) { if (appPackage != null && appPackage.length() > 0) {
antProject.setProperty(ProjectProperties.PROPERTY_APP_PACKAGE_LEGACY, appPackage); antProject.setProperty(ProjectProperties.PROPERTY_APP_PACKAGE_LEGACY, appPackage);