commit c5e607adff80a66bc5420baffd299862abdf368d
author Jean-Luc Brouillet <jeanluc@google.com> Wed Jun 18 18:14:02 2014 -0700
committer Jean-Luc Brouillet <jeanluc@google.com> Thu Jun 19 18:21:27 2014 -0700
tree ccf24dd4206dfc54f4587b7908a084a888d75a41
parent dc6c3df32c527dcfd1b454559e80e6b74d59750b

Change cache dependency tracking.

Remove the fix dependencies and make it depend only on the source
hash.  More changes coming soon to add dependencies on the Android
build fingerprint and the command line used to compile.

Change-Id: I8964044affccf52326ce286f879307eca79d0b24

lib/Renderscript/RSInfoReader.cpp

diff --git a/lib/Renderscript/RSInfoReader.cpp b/lib/Renderscript/RSInfoReader.cpp
index ccf9b73..bf66b66 100644
--- a/lib/Renderscript/RSInfoReader.cpp
+++ b/lib/Renderscript/RSInfoReader.cpp
@@ -36,33 +36,6 @@
                                   const RSInfo &pInfo,
                                   ItemContainer &pResult);
 
-// Process DependencyTableItem in the file
-template<> inline bool
-helper_read_list_item<rsinfo::DependencyTableItem, RSInfo::DependencyTableTy>(
-    const rsinfo::DependencyTableItem &pItem,
-    const RSInfo &pInfo,
-    RSInfo::DependencyTableTy &pResult)
-{
-  const char *id = pInfo.getStringFromPool(pItem.id);
-  const uint8_t *sha1 =
-      reinterpret_cast<const uint8_t *>(pInfo.getStringFromPool(pItem.sha1));
-
-  if (id == NULL) {
-    ALOGE("Invalid string index %d for source id in RS dependenct table.",
-          pItem.id);
-    return false;
-  }
-
-  if (sha1 == NULL) {
-    ALOGE("Invalid string index %d for SHA-1 checksum in RS dependenct table.",
-          pItem.id);
-    return false;
-  }
-
-  pResult.push(std::make_pair(id, sha1));
-  return true;
-}
-
 // Process PragmaItem in the file
 template<> inline bool
 helper_read_list_item<rsinfo::PragmaItem, RSInfo::PragmaListTy>(
@@ -173,7 +146,7 @@
 
 } // end anonymous namespace
 
-RSInfo *RSInfo::ReadFromFile(InputFile &pInput, const DependencyTableTy &pDeps) {
+RSInfo *RSInfo::ReadFromFile(InputFile &pInput) {
   android::FileMap *map = NULL;
   RSInfo *result = NULL;
   const uint8_t *data;
@@ -228,7 +201,6 @@
 
   // Check the size.
   if ((header->headerSize != sizeof(rsinfo::Header)) ||
-      (header->dependencyTable.itemSize != sizeof(rsinfo::DependencyTableItem)) ||
       (header->pragmaList.itemSize != sizeof(rsinfo::PragmaItem)) ||
       (header->objectSlotList.itemSize != sizeof(rsinfo::ObjectSlotItem)) ||
       (header->exportVarNameList.itemSize != sizeof(rsinfo::ExportVarNameItem)) ||
@@ -242,7 +214,6 @@
 #define LIST_DATA_RANGE(_list_header) \
   ((_list_header).offset + (_list_header).count * (_list_header).itemSize)
   if (((header->headerSize + header->strPoolSize) > filesize) ||
-      (LIST_DATA_RANGE(header->dependencyTable) > filesize) ||
       (LIST_DATA_RANGE(header->pragmaList) > filesize) ||
       (LIST_DATA_RANGE(header->objectSlotList) > filesize) ||
       (LIST_DATA_RANGE(header->exportVarNameList) > filesize) ||
@@ -279,9 +250,11 @@
   }
 
   // Populate all the data to the result object.
-  if (!helper_read_list<rsinfo::DependencyTableItem, DependencyTableTy>
-        (data, *result, header->dependencyTable, result->mDependencyTable)) {
-    goto bail;
+  result->mSourceHash =
+              reinterpret_cast<const uint8_t*>(result->getStringFromPool(header->sourceSha1Idx));
+  if (result->mSourceHash == NULL) {
+      ALOGE("Invalid string index %d for SHA-1 checksum of source.", header->sourceSha1Idx);
+      goto bail;
   }
 
   if (!helper_read_list<rsinfo::PragmaItem, PragmaListTy>