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

Commit 08294210 authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Merge "Pass 0 to llvm-rs-cc for current" am: 4a8b5937 

am: 8ae7420c

Change-Id: Ib52235e5bb9011c4526531b68ea90f43741ed351
parents 4ae7e2bb 8ae7420c

core/binary.mk

+1 −1
Original line number Diff line number Diff line
@@ -804,7 +804,7 @@ $(RenderScript_file_stamp): PRIVATE_RS_CC := $(LOCAL_RENDERSCRIPT_CC) 
$(RenderScript_file_stamp): PRIVATE_RS_FLAGS := $(renderscript_flags)

$(RenderScript_file_stamp): PRIVATE_RS_SOURCE_FILES := $(renderscript_sources_fullpath)

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

$(RenderScript_file_stamp): PRIVATE_RS_TARGET_API := $(filter-out current,$(renderscript_target_api))

$(RenderScript_file_stamp): PRIVATE_RS_TARGET_API := $(patsubst current,0,$(renderscript_target_api))

$(RenderScript_file_stamp): PRIVATE_DEP_FILES := $(bc_dep_files)

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

	$(transform-renderscripts-to-cpp-and-bc)

core/java_renderscript.mk

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ $(rs_generated_src_jar): PRIVATE_RS_CC := $(LOCAL_RENDERSCRIPT_CC) 
$(rs_generated_src_jar): PRIVATE_RS_FLAGS := $(renderscript_flags)

$(rs_generated_src_jar): PRIVATE_RS_SOURCE_FILES := $(renderscript_sources_fullpath)

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

$(rs_generated_src_jar): PRIVATE_RS_TARGET_API := $(filter-out current,$(renderscript_target_api))

$(rs_generated_src_jar): PRIVATE_RS_TARGET_API := $(patsubst current,0,$(renderscript_target_api))

$(rs_generated_src_jar): PRIVATE_DEP_FILES := $(bc_dep_files)

$(rs_generated_src_jar): PRIVATE_RS_OUTPUT_RES_ZIP := $(rs_generated_res_zip)

$(rs_generated_src_jar): .KATI_IMPLICIT_OUTPUTS := $(rs_generated_res_zip)