Remove all deprecated BCC C APIs.
This commit revises RSCompilerDriver::build(...) method which is
custom-made for RenderScript. It also removes
RSScript::SourceDependency since RSScript no longer needs to keep
dependency information for its associated source.
Change-Id: I74335b52d0f9fe91343c30caada2a4df07008e5b
diff --git a/lib/RenderScript/RSInfo.cpp b/lib/RenderScript/RSInfo.cpp
index 6f1b309..02f6f6a 100644
--- a/lib/RenderScript/RSInfo.cpp
+++ b/lib/RenderScript/RSInfo.cpp
@@ -73,7 +73,7 @@
bool RSInfo::CheckDependency(const RSInfo &pInfo,
const char *pInputFilename,
- const RSScript::SourceDependencyListTy &pDeps) {
+ const DependencyTableTy &pDeps) {
// Built-in dependencies are libbcc.so, libRS.so and libclcore.bc.
static const unsigned NumBuiltInDependencies = 3;
@@ -125,19 +125,15 @@
}
for (unsigned i = 0; i < pDeps.size(); i++) {
- const RSScript::SourceDependency &in_dep = *(pDeps[i]);
const std::pair<const char *, const uint8_t *> &cache_dep =
pInfo.mDependencyTable[i + NumBuiltInDependencies];
- if ((::strncmp(in_dep.getSourceName().c_str(),
- cache_dep.first,
- in_dep.getSourceName().length()) != 0) ||
- (::memcmp(in_dep.getSHA1Checksum(), cache_dep.second,
+ if ((::strcmp(pDeps[i].first, cache_dep.first) != 0) ||
+ (::memcmp(pDeps[i].second, cache_dep.second,
SHA1_DIGEST_LENGTH) != 0)) {
ALOGD("Cache %s is dirty due to the source it dependends on has been "
"changed:", pInputFilename);
- PRINT_DEPENDENCY("given - ", in_dep.getSourceName().c_str(),
- in_dep.getSHA1Checksum());
+ PRINT_DEPENDENCY("given - ", pDeps[i].first, pDeps[i].second);
PRINT_DEPENDENCY("cache - ", cache_dep.first, cache_dep.second);
return false;
}