diff options
| author | Josiah Gaskin <josiahgaskin@google.com> | 2011-08-15 18:48:47 -0700 |
|---|---|---|
| committer | Josiah Gaskin <josiahgaskin@google.com> | 2011-08-18 14:35:42 -0700 |
| commit | d02592f8bfaf1de01a8d03ee6fb4b2576045c07d (patch) | |
| tree | 8ba93d3de60bf28b4c6d6553380ef78f3834f51a /anttasks/src/com | |
| parent | 239dc46e3f5e80b78ef237a806cc903c83f9e534 (diff) | |
| download | sdk-d02592f8bfaf1de01a8d03ee6fb4b2576045c07d.zip sdk-d02592f8bfaf1de01a8d03ee6fb4b2576045c07d.tar.gz sdk-d02592f8bfaf1de01a8d03ee6fb4b2576045c07d.tar.bz2 | |
Change filename for dependency files
This change updates the filenames for the dependency files to check
in Ant to match the new names of the generated files by AAPT.
(R.java.d and <AppName>.ap_.d respectively).
Change-Id: I41d6aef96aec42c8074aa921801482e4c70363b6
Diffstat (limited to 'anttasks/src/com')
| -rw-r--r-- | anttasks/src/com/android/ant/AaptExecLoopTask.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/anttasks/src/com/android/ant/AaptExecLoopTask.java b/anttasks/src/com/android/ant/AaptExecLoopTask.java index 6b438bb..7b7d82d 100644 --- a/anttasks/src/com/android/ant/AaptExecLoopTask.java +++ b/anttasks/src/com/android/ant/AaptExecLoopTask.java @@ -348,7 +348,7 @@ public final class AaptExecLoopTask extends BaseTask { // Now we figure out what we need to do if (generateRClass) { // Check to see if our dependencies have changed. If not, then skip - if (initDependencies(mRFolder + File.separator + "R.d", watchPaths) + if (initDependencies(mRFolder + File.separator + "R.java.d", watchPaths) && dependenciesHaveChanged() == false) { System.out.println("No changed resources. R.java and Manifest.java untouched."); return; @@ -357,13 +357,12 @@ public final class AaptExecLoopTask extends BaseTask { // Find our dependency file. It should have the same name as our target .ap_ but // with a .d extension String dependencyFilePath = mApkFolder + File.separator + mApkName; - dependencyFilePath = - dependencyFilePath.substring(0, dependencyFilePath.lastIndexOf(".")) + ".d"; + dependencyFilePath += ".d"; // Check to see if our dependencies have changed if (initDependencies(dependencyFilePath , watchPaths) && dependenciesHaveChanged() == false) { - System.out.println("No changed resources or assets. " + dependencyFilePath + System.out.println("No changed resources or assets. " + mApkName + " remains untouched"); return; } |