commit 7fda9848f91fc5cca55f63423b35672128b6daab
author Jean-Luc Brouillet <jeanluc@google.com> Wed Jun 04 19:23:55 2014 +0000
committer Jean-Luc Brouillet <jeanluc@google.com> Wed Jun 04 19:23:55 2014 +0000
tree 83e3403b120f0fc9aa0826a602617d17a8753d9f
parent cc1b9699446aea20773e4c3c6ff5759fedd8ab51

Revert "Don't go through RSContext for the Java reflection."

This reverts commit cc1b9699446aea20773e4c3c6ff5759fedd8ab51.

Change-Id: I330f8beb02ba4868ce115848543c506d5dea46bf

slang_rs.cpp

diff --git a/slang_rs.cpp b/slang_rs.cpp
index 5caa5e5..eb2bdbb 100644
--- a/slang_rs.cpp
+++ b/slang_rs.cpp
@@ -36,7 +36,6 @@
 #include "slang_rs_context.h"
 #include "slang_rs_export_type.h"
 
-#include "slang_rs_reflection.h"
 #include "slang_rs_reflection_cpp.h"
 
 namespace slang {
@@ -75,9 +74,19 @@
   }
 }
 
+bool SlangRS::reflectToJava(const std::string &OutputPathBase,
+                            const std::string &RSPackageName,
+                            bool EmbedBitcodeInJava) {
+  return mRSContext->reflectToJava(OutputPathBase,
+                                   RSPackageName,
+                                   getInputFileName(),
+                                   getOutputFileName(),
+                                   EmbedBitcodeInJava);
+}
+
 bool SlangRS::generateJavaBitcodeAccessor(const std::string &OutputPathBase,
-                                          const std::string &PackageName,
-                                          const std::string *LicenseNote) {
+                                      const std::string &PackageName,
+                                      const std::string *LicenseNote) {
   RSSlangReflectUtils::BitCodeAccessorContext BCAccessorContext;
 
   BCAccessorContext.rsFileName = getInputFileName().c_str();
@@ -349,19 +358,9 @@
             return false;
           }
       } else {
-        if (!RSPackageName.empty()) {
-          mRSContext->setRSPackageName(RSPackageName);
-        }
 
-        RSReflectionJava R(mRSContext, &mGeneratedFileNames);
-        bool ret = R.reflect(JavaReflectionPathBase, mRSContext->getRSPackageName(), RSPackageName,
-                             getInputFileName(), getOutputFileName(), (BitcodeStorage == BCST_JAVA_CODE));
-        if (!ret) {
-          // TODO Is this needed or will the error message have been printed
-          // already? and why not for the C++ case?
-          fprintf(stderr,
-                  "RSContext::reflectToJava : failed to do reflection (%s)\n",
-                  R.getLastError());
+        if (!reflectToJava(JavaReflectionPathBase, RSPackageName, (BitcodeStorage == BCST_JAVA_CODE))) {
+          return false;
         }
 
         for (std::vector<std::string>::const_iterator