summaryrefslogtreecommitdiff
path: root/cpu_ref
diff options
context:
space:
mode:
authorPawin Vongmasa <pawin@google.com>2017-03-09 06:42:14 -0800
committerPawin Vongmasa <pawin@google.com>2017-03-14 17:49:59 -0700
commit1b5eb6526603d0ad79637c4bf27f0757e3c2c93e (patch)
tree337bae83719ecad7913a5b6206a402403175b4cc /cpu_ref
parent6d38a343e90f354f02b4676e9b6219e707832d3c (diff)
downloadrs-1b5eb6526603d0ad79637c4bf27f0757e3c2c93e.tar.gz
Enable c++14 and add dependency on libgui.
This is a required side-effect of making IGraphicBufferProducer a hybrid interface. Test: Compiles Bug: 33854657 Change-Id: I7ec1daed6c9ad1375d8c43c891eec67a0b803c79
Diffstat (limited to 'cpu_ref')
-rw-r--r--cpu_ref/Android.mk5
1 files changed, 2 insertions, 3 deletions
diff --git a/cpu_ref/Android.mk b/cpu_ref/Android.mk
index a8914f10..3e817ae1 100644
--- a/cpu_ref/Android.mk
+++ b/cpu_ref/Android.mk
@@ -1,8 +1,7 @@
LOCAL_PATH:=$(call my-dir)
rs_base_CFLAGS := -Werror -Wall -Wextra \
- -Wno-unused-parameter -Wno-unused-variable \
- -std=c++11
+ -Wno-unused-parameter -Wno-unused-variable
ifeq ($(TARGET_BUILD_PDK), true)
rs_base_CFLAGS += -D__RS_PDK__
endif
@@ -83,7 +82,7 @@ ifeq ($(ARCH_X86_HAVE_SSSE3),true)
rsCpuIntrinsics_x86.cpp
endif
-LOCAL_SHARED_LIBRARIES += libRS_internal libc++ liblog libutils libui libz
+LOCAL_SHARED_LIBRARIES += libRS_internal libc++ liblog libutils libui libgui libz
LOCAL_SHARED_LIBRARIES += libbcinfo libblas
LOCAL_STATIC_LIBRARIES := libbnnmlowp