commit 44d495d2ad8c350a8f586502c9ee8e97a513646a
author Stephen Hines <srhines@google.com> Thu May 22 19:42:55 2014 -0700
committer Stephen Hines <srhines@google.com> Fri May 23 15:49:05 2014 -0700
tree e667e3e455eb3201f6f929ccec52bc2e94eb4d3f
parent c7c6908ef71bd7e82c706fd9005922f214eac931

Clean up embedded bitcode path for Java.

Change-Id: I79cc65778173c7eeab028dedfc4adcb59bef44c2

slang_rs_reflection.cpp

diff --git a/slang_rs_reflection.cpp b/slang_rs_reflection.cpp
index b95cfd9..5e97dcb 100644
--- a/slang_rs_reflection.cpp
+++ b/slang_rs_reflection.cpp
@@ -331,6 +331,10 @@
                   C.getClassName(),
                   1,
                   "RenderScript", "rs");
+
+  if (C.getEmbedBitcodeInJava()) {
+    // Call new constructor
+  }
   // Call alternate constructor with required parameters.
   // Look up the proper raw bitcode resource id via the context.
   C.indent() << "this(rs," << std::endl;
@@ -2035,7 +2039,8 @@
                            const std::string &OutputPackageName,
                            const std::string &RSPackageName,
                            const std::string &InputFileName,
-                           const std::string &OutputBCFileName) {
+                           const std::string &OutputBCFileName,
+                           bool EmbedBitcodeInJava) {
   Context *C = NULL;
   std::string ResourceId = "";
   std::string PaddingPrefix = "";
@@ -2054,10 +2059,10 @@
 
   if (OutputPackageName.empty() || OutputPackageName == "-")
     C = new Context(OutputPathBase, InputFileName, "<Package Name>",
-                    RSPackageName, ResourceId, PaddingPrefix, true);
+                    RSPackageName, ResourceId, PaddingPrefix, true, EmbedBitcodeInJava);
   else
     C = new Context(OutputPathBase, InputFileName, OutputPackageName,
-                    RSPackageName, ResourceId, PaddingPrefix, false);
+                    RSPackageName, ResourceId, PaddingPrefix, false, EmbedBitcodeInJava);
 
   if (C != NULL) {
     std::string ErrorMsg, ScriptClassName;
@@ -2187,7 +2192,13 @@
 
   // Imports
   out() << "import " << mRSPackageName << ".*;" << std::endl;
-  out() << "import android.content.res.Resources;" << std::endl;
+  if (getEmbedBitcodeInJava()) {
+    out() << "import " << mPackageName << "."
+          << RSSlangReflectUtils::JavaBitcodeClassNameFromRSFileName(
+              mInputRSFile.c_str()) << ";" << std::endl;
+  } else {
+    out() << "import android.content.res.Resources;" << std::endl;
+  }
   out() << std::endl;
 
   // All reflected classes should be annotated as hidden, so that they won't