Fix for Android.

johnbash · johnbash · commit 8ec76964db63 · 2020-01-27T16:33:07.000+05:30
Change-Id: I52d9bc5cb57381243ae730decffb3fe6baab6b30
diff --git a/Source/GmmLib/TranslationTable/GmmUmdTranslationTable.h b/Source/GmmLib/TranslationTable/GmmUmdTranslationTable.h
@@ -60,7 +60,12 @@ static inline int _BitScanForward(uint32_t *index, uint32_t mask)
 {
     int i;
 
+#ifdef __ANDROID__
+    i = ffs(mask);
+#else
     i = ffsl(mask);
+#endif
+
     if(i > 0)
     {
         *index = (uint32_t)(i - 1);
diff --git a/Source/GmmLib/inc/External/Common/GmmLibDllName.h b/Source/GmmLib/inc/External/Common/GmmLibDllName.h
@@ -30,6 +30,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 
     #if defined(_WIN64)
         #define GMM_UMD_DLL           "igdgmm64.dll"
+    #elif defined(ANDROID)
+        #define GMM_UMD_DLL           "libigdgmm.so"
     #else
         #define GMM_UMD_DLL           "libigdgmm.so.11"
     #endif
@@ -42,6 +44,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 
     #if defined(_WIN32)
         #define GMM_UMD_DLL     "igdgmm32.dll"
+    #elif defined(ANDROID)
+        #define GMM_UMD_DLL     "libigdgmm.so"
     #else
         #define GMM_UMD_DLL     "libigdgmm.so.11"
     #endif

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,12 @@ static inline int _BitScanForward(uint32_t *index, uint32_t mask)`
`60`	`60`	`{`
`61`	`61`	`int i;`
`62`	`62`
	`63`	`+#ifdef __ANDROID__`
	`64`	`+ i = ffs(mask);`
	`65`	`+#else`
`63`	`66`	`i = ffsl(mask);`
	`67`	`+#endif`
	`68`	`+`
`64`	`69`	`if(i > 0)`
`65`	`70`	`{`
`66`	`71`	`*index = (uint32_t)(i - 1);`