diff options
| author | Miao Wang <miaowang@google.com> | 2017-03-01 11:37:13 -0800 |
|---|---|---|
| committer | Miao Wang <miaowang@google.com> | 2017-03-01 11:37:31 -0800 |
| commit | 197e567ce1ff463f15cf6079b20ceb03ff90db64 (patch) | |
| tree | c60856ebe3a1f1647d5c35f418b1aea285f41fdb /cpu_ref | |
| parent | 0eb48948601241d639d85cb44336c4daeb36f836 (diff) | |
| parent | 35f1149a461643fe8f87e70ed93963201f38786a (diff) | |
| download | rs-197e567ce1ff463f15cf6079b20ceb03ff90db64.tar.gz | |
resolve merge conflicts of 35f1149a to master
Test: mm
Change-Id: I710323b612cb7f6cce9e1250493c65148576e3c5
Diffstat (limited to 'cpu_ref')
| -rw-r--r-- | cpu_ref/Android.mk | 2 | ||||
| -rw-r--r-- | cpu_ref/rsCpuExecutable.cpp | 3 | ||||
| -rw-r--r-- | cpu_ref/rsCpuScript.cpp | 7 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cpu_ref/Android.mk b/cpu_ref/Android.mk index aa48912f..a8914f10 100644 --- a/cpu_ref/Android.mk +++ b/cpu_ref/Android.mk @@ -83,7 +83,7 @@ ifeq ($(ARCH_X86_HAVE_SSSE3),true) rsCpuIntrinsics_x86.cpp endif -LOCAL_SHARED_LIBRARIES += libRS_internal libc++ libcutils liblog libutils libui libz +LOCAL_SHARED_LIBRARIES += libRS_internal libc++ liblog libutils libui libz LOCAL_SHARED_LIBRARIES += libbcinfo libblas LOCAL_STATIC_LIBRARIES := libbnnmlowp diff --git a/cpu_ref/rsCpuExecutable.cpp b/cpu_ref/rsCpuExecutable.cpp index 84456273..426d89e2 100644 --- a/cpu_ref/rsCpuExecutable.cpp +++ b/cpu_ref/rsCpuExecutable.cpp @@ -5,9 +5,10 @@ #include <set> #include <memory> +#include <sys/stat.h> + #ifdef RS_COMPATIBILITY_LIB #include <stdio.h> -#include <sys/stat.h> #include <unistd.h> #else #include "bcc/Config.h" diff --git a/cpu_ref/rsCpuScript.cpp b/cpu_ref/rsCpuScript.cpp index b04e1d28..5bd24240 100644 --- a/cpu_ref/rsCpuScript.cpp +++ b/cpu_ref/rsCpuScript.cpp @@ -27,7 +27,6 @@ #include <bcc/Config.h> #include <bcinfo/MetadataExtractor.h> - #include <cutils/properties.h> #include <zlib.h> #include <sys/file.h> @@ -62,13 +61,13 @@ static bool is_force_recompile() { char buf[PROPERTY_VALUE_MAX]; // Re-compile if floating point precision has been overridden. - property_get("debug.rs.precision", buf, ""); + android::renderscript::property_get("debug.rs.precision", buf, ""); if (buf[0] != '\0') { return true; } // Re-compile if debug.rs.forcerecompile is set. - property_get("debug.rs.forcerecompile", buf, "0"); + android::renderscript::property_get("debug.rs.forcerecompile", buf, "0"); if ((::strcmp(buf, "1") == 0) || (::strcmp(buf, "true") == 0)) { return true; } else { @@ -178,7 +177,7 @@ bool isChecksumNeeded(const char *cacheDir) { (::strcmp(SYSLIBPATH_VENDOR, cacheDir) == 0)) return false; char buf[PROPERTY_VALUE_MAX]; - property_get("ro.debuggable", buf, ""); + android::renderscript::property_get("ro.debuggable", buf, ""); return (buf[0] == '1'); } |