am ba6c98db: am 82943ecf: am d40c93f6: Merge "Add dependency generation to Aapt for...

* commit 'ba6c98db8f21016f81ecac35bb0ea3c433044bb7':
  Add dependency generation to Aapt for R.java

diff --cc AaptAssets.cpp
Simple merge

diff --cc AaptAssets.h
Simple merge

diff --cc Command.cpp
Simple merge

diff --cc Resource.cpp
index 730bd71160f8ce0b9b99fdc1a2c8a2ddda3cb2d0,a603314709ab9c1c1a31da4a052e5f3e77d8da4b..ae4bdc80c31459cc5985362e6d9f81cf28092fef
--- 1/Resource.cpp
--- 2/Resource.cpp
+++ b/Resource.cpp
@@@ -2239,3 -2186,16 +2255,16 @@@ writeProguardFile(Bundle* bundle, cons
  
      return err;
  }
 -}
+ 
+ status_t
+ writeDependencyPreReqs(Bundle* bundle, const sp<AaptAssets>& assets, FILE* fp)
+ {
+     status_t deps = -1;
+     sp<FilePathStore> files = assets->getFullResPaths();
+     for (size_t file_i = 0; file_i < files->size(); ++file_i) {
+         // Add the full file path to the dependency file
+         fprintf(fp, "%s \\\n", files->itemAt(file_i).string());
+         deps++;
+     }
+     return deps;
++}