diff options
| author | Noah Presler <noahp@google.com> | 2015-08-13 00:46:31 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-13 00:46:31 +0000 |
| commit | 707f2aa01c022b93b85111e5bfc7b1e9b2608cec (patch) | |
| tree | 709949dc3e70f571b57687ff714ad4ba3743bad8 | |
| parent | 3c03a3a401471d5d59d6ab988a92720b79b5b8fe (diff) | |
| parent | 65b62256a7c1254fd3ce3b2818fb840e9a5518bc (diff) | |
| download | opencv3-707f2aa01c022b93b85111e5bfc7b1e9b2608cec.tar.gz | |
am 65b62256: Link against static libRScpp rather than shared
* commit '65b62256a7c1254fd3ce3b2818fb840e9a5518bc':
Link against static libRScpp rather than shared
| -rw-r--r-- | Android.mk | 7 |
1 files changed, 4 insertions, 3 deletions
@@ -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 |