|
@@ -1534,11 +1534,15 @@ bool expandPath( char* pDstPath, U32 size, const char* pSrcPath, const char* pWo
|
|
return true;
|
|
return true;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ // All else.
|
|
|
|
+
|
|
//Using a special case here because the code below barfs on trying to build a full path for apk reading
|
|
//Using a special case here because the code below barfs on trying to build a full path for apk reading
|
|
#ifdef TORQUE_OS_ANDROID
|
|
#ifdef TORQUE_OS_ANDROID
|
|
- dSprintf(pathBuffer, sizeof(pathBuffer), "/%s", pSrcPath);
|
|
|
|
|
|
+ if (leadingToken == '/' || strstr(pSrcPath, "/") == NULL)
|
|
|
|
+ Platform::makeFullPathName( pSrcPath, pathBuffer, sizeof(pathBuffer), pWorkingDirectoryHint );
|
|
|
|
+ else
|
|
|
|
+ dSprintf(pathBuffer, sizeof(pathBuffer), "/%s", pSrcPath);
|
|
#else
|
|
#else
|
|
- // All else.
|
|
|
|
Platform::makeFullPathName( pSrcPath, pathBuffer, sizeof(pathBuffer), pWorkingDirectoryHint );
|
|
Platform::makeFullPathName( pSrcPath, pathBuffer, sizeof(pathBuffer), pWorkingDirectoryHint );
|
|
#endif
|
|
#endif
|
|
|
|
|