commit 59f22c376b2c1cd109735280689224fadfe40b42
author Jean-Luc Brouillet <jeanluc@google.com> Wed Jun 04 14:53:48 2014 -0700
committer Jean-Luc Brouillet <jeanluc@google.com> Thu Jun 05 15:31:00 2014 -0700
tree 3da5065411c0d1f84c595c467363f15e9a31521c
parent ffc5a94e02d6949b1f4b019e3dd0aeafb19572c8

Set the reflection parameters in the constructors.

Change-Id: I3c74ab5a10d7aa3adaf460c56d2ab295a766fcfb

slang_rs.cpp

diff --git a/slang_rs.cpp b/slang_rs.cpp
index e2910ce..5a30de3 100644
--- a/slang_rs.cpp
+++ b/slang_rs.cpp
@@ -342,10 +342,9 @@
     if (OutputType != Slang::OT_Dependency) {
 
       if (BitcodeStorage == BCST_CPP_CODE) {
-          RSReflectionCpp R(mRSContext);
-          bool ret = R.reflect(JavaReflectionPathBase, getInputFileName(),
-                               getOutputFileName());
-          if (!ret) {
+          RSReflectionCpp R(mRSContext, JavaReflectionPathBase, getInputFileName(),
+                            getOutputFileName());
+          if (!R.reflect()) {
             return false;
           }
       } else {
@@ -353,11 +352,11 @@
           mRSContext->setRSPackageName(RSPackageName);
         }
 
-        RSReflectionJava R(mRSContext, &mGeneratedFileNames);
-        if (!R.reflect(JavaReflectionPathBase,
-                       mRSContext->getReflectJavaPackageName(),
-                       mRSContext->getRSPackageName(), getInputFileName(),
-                       getOutputFileName(), BitcodeStorage == BCST_JAVA_CODE)) {
+        RSReflectionJava R(mRSContext, &mGeneratedFileNames,
+                           JavaReflectionPathBase, getInputFileName(),
+                           getOutputFileName(),
+                           BitcodeStorage == BCST_JAVA_CODE);
+        if (!R.reflect()) {
           // 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 "