diff options
| author | Miao Wang <miaowang@google.com> | 2015-01-16 16:33:52 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-01-16 16:33:53 +0000 |
| commit | 2b942f87f6b74ad9c5381fa96dcb1d46f155779b (patch) | |
| tree | 2edc97621d6c609582565f9292fbbe1a26deab5d /core/java.mk | |
| parent | 59cbe2c65cdd2dc3f1ef7a64a4bf6e3543d07207 (diff) | |
| parent | ec27a8966ca78bdcbf5adb5643b2b2f1d0271e39 (diff) | |
| download | build-2b942f87f6b74ad9c5381fa96dcb1d46f155779b.zip build-2b942f87f6b74ad9c5381fa96dcb1d46f155779b.tar.gz build-2b942f87f6b74ad9c5381fa96dcb1d46f155779b.tar.bz2 | |
Merge "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 428a9ce..80bf530 100644 --- a/core/java.mk +++ b/core/java.mk @@ -221,10 +221,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: \ |