Merge changes from topic 'rsDebugVersionInfo' into oc-dev

* changes:
  Update tests to reflect recent changes in lldb upstream and librs
  Add .rs.info versionInfo parser to the cpu_ref driver

1 files changed, 21 insertions, 0 deletions

diff --git a/cpu_ref/rsCpuExecutable.cpp b/cpu_ref/rsCpuExecutable.cpp
index 91d93556..045b915d 100644
--- a/cpu_ref/rsCpuExecutable.cpp
+++ b/cpu_ref/rsCpuExecutable.cpp
@@ -273,6 +273,7 @@ void* SharedLibraryUtils::loadSOHelper(const char *origName, const char *cacheDi
 #define PRAGMA_STR "pragmaCount: "
 #define THREADABLE_STR "isThreadable: "
 #define CHECKSUM_STR "buildChecksum: "
+#define VERSIONINFO_STR "versionInfo: "
 
 // Copy up to a newline or size chars from str -> s, updating str
 // Returns s when successful and nullptr when '\0' is finally reached.
@@ -667,6 +668,26 @@ ScriptExecutable* ScriptExecutable::createFromSharedObject(
         goto error;
     }
 
+    {
+      // Parse the version info string, but ignore its contents as it's only
+      // used by the debugger
+      size_t nLines = 0;
+      if (strgets(line, MAXLINE, &rsInfo) != nullptr) {
+        if (sscanf(line, VERSIONINFO_STR "%zu", &nLines) != 1) {
+          ALOGE("invalid versionInfo count");
+          goto error;
+        } else {
+          // skip the versionInfo packet as libRs doesn't use it
+          while (nLines--) {
+            if (strgets(line, MAXLINE, &rsInfo) == nullptr)
+              goto error;
+          }
+        }
+      } else {
+        ALOGE(".rs.info is missing versionInfo section");
+      }
+    }
+
 #endif  // RS_COMPATIBILITY_LIB
 
     // Read in information about mutable global variables provided by bcc's