Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 205aaf16 authored by Tim Murray's avatar Tim Murray Committed by Android (Google) Code Review
Browse files

Merge "Don't build librs.*.so in bundled branches since we'll use native RS." into jb-mr2-dev

parents ae2394a8 8e0567ae

core/java.mk

+9 −0
Original line number Diff line number Diff line
@@ -206,6 +206,11 @@ rs_generated_bc := $(addprefix \ 
    $(renderscript_intermediate.COMMON)/res/raw/, $(bc_files))



renderscript_intermediate := $(intermediates)/renderscript



# We don't need the .so files in bundled branches

# Prevent these from showing up on the device

ifneq (,$(TARGET_BUILD_APPS))



rs_compatibility_jni_libs := $(addprefix \

    $(renderscript_intermediate)/librs., \

    $(patsubst %.bc,%.so, $(bc_files)))
@@ -216,6 +221,8 @@ 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_compatibility_jni_libs): $(RenderScript_file_stamp) $(RS_PREBUILT_CLCORE) \

    $(rs_support_lib) $(rs_jni_lib) $(rs_compiler_rt)

$(rs_compatibility_jni_libs): $(BCC_COMPAT)
@@ -226,6 +233,8 @@ $(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \ 


endif



endif



# include the dependency files (.d) generated by llvm-rs-cc.

renderscript_generated_dep_files := $(addprefix $(renderscript_intermediate.COMMON)/, \

    $(patsubst %.fs,%.d, $(patsubst %.rs,%.d, $(notdir $(renderscript_sources)))))