aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Presler <noahp@google.com>2015-08-12 17:12:03 -0700
committerYang Ni <yangni@google.com>2015-08-13 00:15:48 +0000
commit65b62256a7c1254fd3ce3b2818fb840e9a5518bc (patch)
tree709949dc3e70f571b57687ff714ad4ba3743bad8
parentf5c7cd2e2c1bb8102632cdbec636a409ea4a64b0 (diff)
downloadopencv3-65b62256a7c1254fd3ce3b2818fb840e9a5518bc.tar.gz
Link against static libRScpp rather than shared
Change-Id: Ia8ccb3658d3c99239b8582158a6210d5df3788a2
-rw-r--r--Android.mk7
1 files changed, 4 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index d47596b..5d5248a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -859,8 +859,7 @@ LOCAL_MODULE := libopencv_rsobjdetect
LOCAL_NDK_STL_VARIANT := gnustl_static
LOCAL_SDK_VERSION := 21
-
-LOCAL_CFLAGS := $(LOCAL_C_INCLUDES:%=-I%)
+LOCAL_RENDERSCRIPT_TARGET_API := 21
LOCAL_C_INCLUDES := \
modules/rsobjdetect/src
@@ -873,11 +872,13 @@ LOCAL_LDFLAGS := -llog -ldl
LOCAL_MODULE_TAGS := optional
+LOCAL_RENDERSCRIPT_COMPATIBILITY := 21
+
LOCAL_C_INCLUDES := frameworks/rs/cpp
LOCAL_C_INCLUDES += frameworks/rs
LOCAL_C_INCLUDES += $(call intermediates-dir-for,STATIC_LIBRARIES,libRS,TARGET,)
-LOCAL_SHARED_LIBRARIES := libRScpp
+LOCAL_STATIC_LIBRARIES := libRScpp_static
LOCAL_CLANG := true