diff options
| author | Tim Murray <timmurray@google.com> | 2014-01-15 23:17:27 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-15 23:17:27 +0000 |
| commit | a9861e8fe76a0252c0b5105c4796590f988a1030 (patch) | |
| tree | 3c1ea4f5f1404530429e185274f55edf064a52cc /cpp/RenderScript.cpp | |
| parent | 5c718a81f7396cd1716cc2b71684104716263e09 (diff) | |
| parent | 9ee891e3024399c0d0ea0d44d2997cdf357f2d30 (diff) | |
am 9ee891e3: am f171923b: Merge "Fix NDK API on old devices."
* commit '9ee891e3024399c0d0ea0d44d2997cdf357f2d30':
Fix NDK API on old devices.
Diffstat (limited to 'cpp/RenderScript.cpp')
| -rw-r--r-- | cpp/RenderScript.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/cpp/RenderScript.cpp b/cpp/RenderScript.cpp index 3a75ffe0..04f1e88e 100644 --- a/cpp/RenderScript.cpp +++ b/cpp/RenderScript.cpp @@ -23,11 +23,15 @@ #include "rsCppInternal.h" #include <dlfcn.h> +#include <unistd.h> -#if !defined(RS_SERVER) && defined(HAVE_ANDROID_OS) +#if !defined(RS_SERVER) && !defined(RS_COMPATIBILITY_LIB) && defined(HAVE_ANDROID_OS) #include <cutils/properties.h> +#else +#include "rsCompatibilityLib.h" #endif + using namespace android; using namespace RSC; @@ -473,7 +477,6 @@ bool RS::init(std::string &name, int targetApi, uint32_t flags) { } mCacheDir = name; - mCacheDir += "/com.android.renderscript.cache/"; mDev = RS::dispatch->DeviceCreate(); if (mDev == 0) { |