Remove libcutils dependency.

 - Implement property_get using __system_property_get, remove
 dependencies on cutils/properties.h.
 - remove rsCompatibilityLib.cpp since it only contains propery_get, and
 it is now in rsCppUtils.cpp.
 - Disable ATRACE. The systrace is current done in Java level. If we
 want to do it in the driver, we need to have our own implementation
 similar to native/utils/trace.cc
 - Remove CC_LIKELY macro.

Bug: 34396220
Test: build

Change-Id: I6a6cbcfb2ca15b9d1f09b9ce0579d39fdbe98727

1 files changed, 3 insertions, 4 deletions

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');
 }