Support x86+arm mode
In that mode libraries could be found in /system/lib/arm, not in
/system/lib or /system/lib64
Test: cts-tradefed run cts -s 77DCDB7A -m CtsRsCppTestCases
BUG=27783760
Change-Id: I31227b281637b93c75b507b03cb4e71a31d670a0
diff --git a/cpu_ref/rsCpuScript.h b/cpu_ref/rsCpuScript.h
index 94345bd..d6d100c 100644
--- a/cpu_ref/rsCpuScript.h
+++ b/cpu_ref/rsCpuScript.h
@@ -155,9 +155,15 @@
#ifdef __LP64__
#define SYSLIBPATH "/system/lib64"
+#define SYSLIBPATH_BC "/system/lib64"
#define SYSLIBPATH_VENDOR "/system/vendor/lib64"
+#elif defined(BUILD_ARM_FOR_X86) && defined(__arm__)
+#define SYSLIBPATH "/system/lib/arm"
+#define SYSLIBPATH_BC "/system/lib"
+#define SYSLIBPATH_VENDOR "/system/vendor/lib/arm"
#else
#define SYSLIBPATH "/system/lib"
+#define SYSLIBPATH_BC "/system/lib"
#define SYSLIBPATH_VENDOR "/system/vendor/lib"
#endif