am d98e1be2: am f4750724: am 9d829f98: am 21e6e2de: Merge "Change generated dependenc...

* commit 'd98e1be20e1cca5c36c7e0344500d4a5574568aa':
  Change generated dependency file names

diff --combined Resource.cpp
index cb6484fcf2af7a921c5fa38894d14eed06dc4b7b,bb56af9afb7dcc4852051dad5e8b1d37b44b9298..2e796a2f66aa4f050666ce9ef8461207abf1aa54
--- 1/Resource.cpp
--- 2/Resource.cpp
+++ b/Resource.cpp
@@@ -1958,10 -1958,12 +1958,12 @@@ status_t writeResourceSymbols(Bundle* b
          }
          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());
@@@ -2244,11 -2246,6 +2246,11 @@@ writeProguardForLayouts(ProguardKeepSet
              }
          }
      }
 +    // Handle the overlays
 +    sp<AaptAssets> overlay = assets->getOverlay();
 +    if (overlay.get()) {
 +        return writeProguardForLayouts(keep, overlay);
 +    }
      return NO_ERROR;
  }