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

Merge change 3868 into donut

Browse Source 
* changes:
  ADT #1909458: fix 'android update project': "build.xml is too old"
This commit is contained in:
Android (Google) Code Review
2009-06-11 11:55:36 -07:00
parent 134c84ab62 bd13b6ce02
commit c390708d03
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tools/sdkmanager/libs/sdklib/src/com/android/sdklib/internal/project/ProjectCreator.java
View File

@@ -391,13 +391,18 @@ public class ProjectCreator {
File buildXml = new File(projectFolder, SdkConstants.FN_BUILD_XML); File buildXml = new File(projectFolder, SdkConstants.FN_BUILD_XML);
boolean needsBuildXml = projectName != null || !buildXml.exists(); boolean needsBuildXml = projectName != null || !buildXml.exists();
if (!needsBuildXml) { if (!needsBuildXml) {
// Note that "<androidinit" must be followed by either a whitespace, a "/" (for the // Look for for a classname="com.android.ant.SetupTask" attribute
needsBuildXml = !checkFileContainsRegexp(buildXml,
"classname=\"com.android.ant.SetupTask\""); //$NON-NLS-1$
}
if (!needsBuildXml) {
// Note that "<setup" must be followed by either a whitespace, a "/" (for the
// XML /> closing tag) or an end-of-line. This way we know the XML tag is really this // XML /> closing tag) or an end-of-line. This way we know the XML tag is really this
// one and later we will be able to use an "androidinit2" tag or such as necessary. // one and later we will be able to use an "androidinit2" tag or such as necessary.
needsBuildXml = !checkFileContainsRegexp(buildXml, "<androidinit(?:\\s|/|$)"); needsBuildXml = !checkFileContainsRegexp(buildXml, "<setup(?:\\s|/|$)"); //$NON-NLS-1$
if (needsBuildXml) { }
println("File %1$s is too old and needs to be updated.", SdkConstants.FN_BUILD_XML); if (needsBuildXml) {
} println("File %1$s is too old and needs to be updated.", SdkConstants.FN_BUILD_XML);
} }
if (needsBuildXml) { if (needsBuildXml) {