am 21e6e2de: Merge "Change generated dependency file names"

* commit '21e6e2de1f0062f949fcc52d0b4559dfa3246e0e':
  Change generated dependency file names

1 files changed, 3 insertions, 1 deletions

diff --git a/tools/aapt/Resource.cpp b/tools/aapt/Resource.cpp
index 5152d3b5ed3f..f64728d0a8c5 100644
--- a/tools/aapt/Resource.cpp
+++ b/tools/aapt/Resource.cpp
@@ -1890,10 +1890,12 @@ status_t writeResourceSymbols(Bundle* bundle, const sp<AaptAssets>& assets,
         }
         fclose(fp);
 
+        // If we were asked to generate a dependency file, we'll go ahead and add this R.java
+        // as a target in the dependency file right next to it.
         if (bundle->getGenDependencies()) {
             // Add this R.java to the dependency file
             String8 dependencyFile(bundle->getRClassDir());
-            dependencyFile.appendPath("R.d");
+            dependencyFile.appendPath("R.java.d");
 
             fp = fopen(dependencyFile.string(), "a");
             fprintf(fp,"%s \\\n", dest.string());