bcc vendor plugin must be loaded from the sphal namespace

am: 8d421ca1f0

Change-Id: Ia85eff89e376f09fac5cf203b2f6bf16b558604d

1 files changed, 6 insertions, 0 deletions

diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp
index cf1b869f..15cd9952 100644
--- a/cpu_ref/rsCpuScript.cpp
+++ b/cpu_ref/rsCpuScript.cpp
@@ -108,7 +108,13 @@ static void setCompileArguments(std::vector<const char*>* args,
         // Only load additional libraries for compiles that don't use
         // the debug context.
         if (bccPluginName && strlen(bccPluginName) > 0) {
+#ifdef __ANDROID__
+            // For Android, -plugin option must be used in order to load the
+            // vendor plugin from the sphal namespace.
+            args->push_back("-plugin");
+#else
             args->push_back("-load");
+#endif
             args->push_back(bccPluginName);
         }
     }