commit 0f6b1d319d0d3605042345c4a6973e9c4e9161d7
author Stephen Hines <srhines@google.com> Thu May 03 12:29:33 2012 -0700
committer Stephen Hines <srhines@google.com> Thu May 03 15:36:10 2012 -0700
tree 0304261a00d882505a21232faf58dc0bd1f2de90
parent addca8fc02254162220f6d512c59c84d65f44d2d

Revert "Introduce RSInfo and its reader/extractor/writer."

This reverts commit 255cbc8a78131fd828de0fac3ff70baeaa2f032f.

Conflicts:

	lib/ExecutionEngine/RSInfoExtractor.cpp

Change-Id: I533398c25cd7fde2a76418101d29374b6e1d2b27

lib/ExecutionEngine/MCCacheWriter.h

diff --git a/lib/ExecutionEngine/MCCacheWriter.h b/lib/ExecutionEngine/MCCacheWriter.h
index 47f1e40..1f462b3 100644
--- a/lib/ExecutionEngine/MCCacheWriter.h
+++ b/lib/ExecutionEngine/MCCacheWriter.h
@@ -36,7 +36,8 @@
 
     std::vector<std::pair<char const *, size_t> > mStringPool;
 
-    std::map<std::string, unsigned char const *> mDependencies;
+    std::map<std::string,
+             std::pair<uint32_t, unsigned char const *> > mDependencies;
 
     MCO_Header *mpHeaderSection;
     MCO_StringPool *mpStringPoolSection;
@@ -64,9 +65,11 @@
     bool writeCacheFile(OutputFile &objFile, OutputFile &infoFile,
                         RSScript *S, uint32_t libRS_threadable);
 
-    void addDependency(std::string const &resName,
+    void addDependency(MCO_ResourceType resType,
+                       std::string const &resName,
                        unsigned char const *sha1) {
-      mDependencies.insert(std::make_pair(resName, sha1));
+      mDependencies.insert(std::make_pair(resName,
+                           std::make_pair((uint32_t)resType, sha1)));
     }
 
   private: