diff options
| author | Miao Wang <miaowang@google.com> | 2015-01-16 16:50:15 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 16:50:15 +0000 |
| commit | a3edd760d347a776ca8ac10063b70d0f8a0349a6 (patch) | |
| tree | 48b65afa2f2ac84397433f17cdb1256606b128dc /core/java.mk | |
| parent | 4c5166c25dcf340d815499883ffa348677c21218 (diff) | |
| parent | 50ef904068c37792015040c1c28a117fafe328a6 (diff) | |
| download | build-a3edd760d347a776ca8ac10063b70d0f8a0349a6.zip build-a3edd760d347a776ca8ac10063b70d0f8a0349a6.tar.gz build-a3edd760d347a776ca8ac10063b70d0f8a0349a6.tar.bz2 | |
am 50ef9040: am 2b942f87: Merge "Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)"
* commit '50ef904068c37792015040c1c28a117fafe328a6':
Add build rules for libRSSupportIO (Usage_IO lib for RS compat lib)
Diffstat (limited to 'core/java.mk')
| -rw-r--r-- | core/java.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/core/java.mk b/core/java.mk index 88fa8ae..a2bd00b 100644 --- a/core/java.mk +++ b/core/java.mk @@ -232,10 +232,16 @@ rs_support_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/libRSSupport.so rs_jni_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/librsjni.so LOCAL_JNI_SHARED_LIBRARIES += libRSSupport librsjni +rs_support_io_lib := +# check if the target api level support USAGE_IO +ifeq ($(filter $(RSCOMPAT_NO_USAGEIO_API_LEVELS),$(renderscript_target_api)),) +rs_support_io_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/libRSSupportIO.so +LOCAL_JNI_SHARED_LIBRARIES += libRSSupportIO +endif $(rs_compatibility_jni_libs): $(RenderScript_file_stamp) $(RS_PREBUILT_CLCORE) \ - $(rs_support_lib) $(rs_jni_lib) $(rs_compiler_rt) + $(rs_support_lib) $(rs_support_io_lib) $(rs_jni_lib) $(rs_compiler_rt) $(rs_compatibility_jni_libs): $(BCC_COMPAT) $(rs_compatibility_jni_libs): PRIVATE_CXX := $(TARGET_CXX) $(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \ |