summaryrefslogtreecommitdiff
path: root/cpu_ref
diff options
context:
space:
mode:
authorJiyong Park <jiyong@google.com>2017-08-10 20:37:20 +0900
committerJiyong Park <jiyong@google.com>2017-08-10 20:38:40 +0900
commit6fa614124bdf4b5b5cfe8bbd51ee95a6d4dadbb6 (patch)
tree50080c4ed8d66f9b5e6b5d6c8227cd1ca355609d /cpu_ref
parent996f52b4d3ff3f861245272a3f1599156b01b445 (diff)
downloadrs-6fa614124bdf4b5b5cfe8bbd51ee95a6d4dadbb6.tar.gz
Mark RS libs as VNDK-SP
The RS libs are used by RS HAL implementations which are Same-process HALs. In order to make the RS libs available to the HALs, they are marked as VNDK-SP. Bug: 64425518 Test: BOARD_VNDK_VERSION=current m -j libRSDriver.vendor Test: BOARD_VNDK_VERSION=current m -j libRS_internal.vendor Test: BOARD_VNDK_VERSION=current m -j libRSCpuRef.vendor Change-Id: Ia5c9d59b98b6a910a8cb76be1e823da542ca043a
Diffstat (limited to 'cpu_ref')
-rw-r--r--cpu_ref/Android.bp9
-rw-r--r--cpu_ref/rsCpuExecutable.cpp2
2 files changed, 10 insertions, 1 deletions
diff --git a/cpu_ref/Android.bp b/cpu_ref/Android.bp
index 84b2b0b7..e929a9c4 100644
--- a/cpu_ref/Android.bp
+++ b/cpu_ref/Android.bp
@@ -1,6 +1,11 @@
cc_library_shared {
name: "libRSCpuRef",
defaults: ["libbcc-targets"],
+ vendor_available: true,
+ vndk: {
+ enabled: true,
+ support_system_process: true,
+ },
srcs: [
"rsCpuCore.cpp",
@@ -97,6 +102,10 @@ cc_library_shared {
"libblas",
],
static_libs: ["libbnnmlowp"],
+ header_libs: [
+ "libutils_headers",
+ "libhardware_headers",
+ ],
include_dirs: [
"frameworks/compile/libbcc/include",
diff --git a/cpu_ref/rsCpuExecutable.cpp b/cpu_ref/rsCpuExecutable.cpp
index c42ea0fd..9dcc842c 100644
--- a/cpu_ref/rsCpuExecutable.cpp
+++ b/cpu_ref/rsCpuExecutable.cpp
@@ -9,11 +9,11 @@
#ifdef RS_COMPATIBILITY_LIB
#include <stdio.h>
-#include <unistd.h>
#else
#include "bcc/Config.h"
#endif
+#include <unistd.h>
#include <dlfcn.h>
#include <sys/stat.h>