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

Commit 48b6e18f authored by Ying Wang's avatar Ying Wang Committed by Android (Google) Code Review
Browse files

Merge "Build rs_compatibility_jni_libs into product-specific dir" into jb-mr2-dev

parents 4dbbd8a3 370fa673

core/java.mk

+6 −5
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ rs_compatibility_jni_libs := 
ifneq ($(renderscript_sources),)

renderscript_sources_fullpath := $(addprefix $(LOCAL_PATH)/, $(renderscript_sources))

RenderScript_file_stamp := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/RenderScript.stamp

renderscript_intermediate := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/renderscript

renderscript_intermediate.COMMON := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/renderscript



renderscript_target_api :=
@@ -191,7 +191,7 @@ $(RenderScript_file_stamp): PRIVATE_RS_FLAGS := $(renderscript_flags) 
$(RenderScript_file_stamp): PRIVATE_RS_SOURCE_FILES := $(renderscript_sources_fullpath)

# By putting the generated java files into $(LOCAL_INTERMEDIATE_SOURCE_DIR), they will be

# automatically found by the java compiling function transform-java-to-classes.jar.

$(RenderScript_file_stamp): PRIVATE_RS_OUTPUT_DIR := $(renderscript_intermediate)

$(RenderScript_file_stamp): PRIVATE_RS_OUTPUT_DIR := $(renderscript_intermediate.COMMON)

$(RenderScript_file_stamp): PRIVATE_RS_TARGET_API := $(renderscript_target_api)

$(RenderScript_file_stamp): $(renderscript_sources_fullpath) $(LOCAL_RENDERSCRIPT_CC)

	$(transform-renderscripts-to-java-and-bc)
@@ -203,8 +203,9 @@ endif 
ifneq ($(LOCAL_RENDERSCRIPT_COMPATIBILITY),)

bc_files := $(patsubst %.fs,%.bc, $(patsubst %.rs,%.bc, $(notdir $(renderscript_sources))))

rs_generated_bc := $(addprefix \

    $(renderscript_intermediate)/res/raw/, $(bc_files))

    $(renderscript_intermediate.COMMON)/res/raw/, $(bc_files))



renderscript_intermediate := $(intermediates)/renderscript

rs_compatibility_jni_libs := $(addprefix \

    $(renderscript_intermediate)/librs., \

    $(patsubst %.bc,%.so, $(bc_files)))
@@ -232,13 +233,13 @@ $(rs_compatibility_jni_libs): PRIVATE_LIBCLCORE := $(rs_built_clcore) 
$(rs_compatibility_jni_libs): PRIVATE_COMPILER_RT := $(rs_compiler_rt)

$(rs_compatibility_jni_libs): PRIVATE_LIBPATH := $(rs_extra_libpath)

$(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \

    $(renderscript_intermediate)/res/raw/%.bc

    $(renderscript_intermediate.COMMON)/res/raw/%.bc

	$(transform-bc-to-so)



endif



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

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

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

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

-include $(renderscript_generated_dep_files)