diff options
| author | Miao Wang <miaowang@google.com> | 2014-10-16 11:48:28 -0700 |
|---|---|---|
| committer | Miao Wang <miaowang@google.com> | 2014-11-11 17:56:53 -0800 |
| commit | 48d2eae90f08dc33754a9d280337249690a954d6 (patch) | |
| tree | 17560d206f4258474532f499a529089b0cfdef0e /cpp/Android.mk | |
| parent | 8dfd7a77b68ca41ac6502ca596f3a21e06865e24 (diff) | |
| download | rs-48d2eae90f08dc33754a9d280337249690a954d6.tar.gz | |
Create a separate static lib that provides a dispatch table to both
fw/support/v8/renderscript/jni and libRScpp to reduce code duplication.
- This CL contains the static lib (libDispatch)
and related changes to libRScpp.
Change-Id: I65a4a74370720869eacf197ab31314c1df8dadcb
Merged Conflicts:
cpp/Android.mk
cpp/RenderScript.cpp
Diffstat (limited to 'cpp/Android.mk')
| -rw-r--r-- | cpp/Android.mk | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/cpp/Android.mk b/cpp/Android.mk index f2457af5..b791ce1f 100644 --- a/cpp/Android.mk +++ b/cpp/Android.mk @@ -1,3 +1,22 @@ +LOCAL_PATH:= $(call my-dir) +include $(CLEAR_VARS) + +LOCAL_SRC_FILES:= \ + rsDispatch.cpp + +LOCAL_C_INCLUDES += \ + frameworks/rs + +LOCAL_CFLAGS += -Wno-unused-parameter + +LOCAL_MODULE:= libRSDispatch +LOCAL_MODULE_TAGS := optional +LOCAL_LDFLAGS += -ldl + +include $(BUILD_STATIC_LIBRARY) + +include $(CLEAR_VARS) + rs_cpp_SRC_FILES := \ RenderScript.cpp \ BaseObj.cpp \ @@ -9,10 +28,7 @@ rs_cpp_SRC_FILES := \ ScriptIntrinsics.cpp \ Sampler.cpp -LOCAL_PATH:= $(call my-dir) -include $(CLEAR_VARS) LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk - include frameworks/compile/slang/rs_version.mk local_cflags_for_rs_cpp += $(RS_VERSION_DEFINE) local_cflags_for_rs_cpp += -Wno-unused-parameter -std=c++11 @@ -31,6 +47,9 @@ LOCAL_SHARED_LIBRARIES := \ liblog \ libdl \ +LOCAL_STATIC_LIBRARIES := \ + libRSDispatch + LOCAL_MODULE:= libRScpp LOCAL_MODULE_TAGS := optional @@ -63,7 +82,8 @@ LOCAL_SRC_FILES += ../rsCompatibilityLib.cpp LOCAL_WHOLE_STATIC_LIBRARIES := \ libutils \ - libstlport_static + libstlport_static \ + libRSDispatch LOCAL_MODULE:= libRScpp_static |