commit ee9d7b0e0cb74a592cef718d72b589b64997bd21
author Tim Murray <timmurray@google.com> Tue Jul 30 11:13:27 2013 -0700
committer Tim Murray <timmurray@google.com> Wed Jul 31 16:13:01 2013 -0700
tree c4b83a787983dbc47055433eb42c4a109c4ca595
parent dde98533fad4c6534af537ae583aa4db35a1c699

Fix a bug with compat lib support. Add new namespace to sp<>.

Change-Id: I5dd513b58757be79984dd16db63c19cc1d076658

slang_rs_reflection_cpp.cpp

diff --git a/slang_rs_reflection_cpp.cpp b/slang_rs_reflection_cpp.cpp
index 55b3d4d..a6a921a 100644
--- a/slang_rs_reflection_cpp.cpp
+++ b/slang_rs_reflection_cpp.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2012, The Android Open Source Project
+ * Copyright 2013, The Android Open Source Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,7 +70,7 @@
           static_cast<const RSExportPointerType*>(ET)->getPointeeType();
 
       if (PointeeType->getClass() != RSExportType::ExportClassRecord)
-        return "android::sp<android::RSC::Allocation>";
+        return "android::RSC::sp<android::RSC::Allocation>";
       else
         return PointeeType->getElementName();
     }
@@ -180,7 +180,7 @@
 
   write("public:");
   incIndent();
-  write(mClassName + "(android::sp<android::RSC::RS> rs);");
+  write(mClassName + "(android::RSC::sp<android::RSC::RS> rs);");
   write("virtual ~" + mClassName + "();");
   write("");
 
@@ -208,12 +208,12 @@
 
     if (ef->hasIn()) {
       Args.push_back(std::make_pair(
-          "android::sp<const android::RSC::Allocation>", "ain"));
+          "android::RSC::sp<const android::RSC::Allocation>", "ain"));
     }
 
     if (ef->hasOut() || ef->hasReturn()) {
       Args.push_back(std::make_pair(
-          "android::sp<const android::RSC::Allocation>", "aout"));
+          "android::RSC::sp<const android::RSC::Allocation>", "aout"));
     }
 
     const RSExportRecordType *ERT = ef->getParamPacketType();
@@ -292,9 +292,9 @@
   stringstream ss;
   const std::string &packageName = mRSContext->getReflectJavaPackageName();
   ss << mClassName << "::" << mClassName
-     << "(android::sp<android::RSC::RS> rs):\n"
+     << "(android::RSC::sp<android::RSC::RS> rs):\n"
         "        ScriptC(rs, __txt, sizeof(__txt), \""
-     << mClassName << "\", " << mClassName.length()
+     << stripRS(mInputFileName) << "\", " << stripRS(mInputFileName).length()
      << ", \"/data/data/" << packageName << "/app\", sizeof(\"" << packageName << "\")) {";
   write(ss);
   incIndent();
@@ -324,12 +324,12 @@
 
     if (ef->hasIn()) {
       Args.push_back(std::make_pair(
-          "android::sp<const android::RSC::Allocation>", "ain"));
+          "android::RSC::sp<const android::RSC::Allocation>", "ain"));
     }
 
     if (ef->hasOut() || ef->hasReturn()) {
       Args.push_back(std::make_pair(
-          "android::sp<const android::RSC::Allocation>", "aout"));
+          "android::RSC::sp<const android::RSC::Allocation>", "aout"));
     }
 
     const RSExportRecordType *ERT = ef->getParamPacketType();