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

Commit 60e9f76b authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Support LOCAL_RENDERSCRIPT_TARGET_API := current"

parents e6469411 532ae3bc

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 := $(renderscript_target_api)

$(RenderScript_file_stamp): PRIVATE_RS_TARGET_API := $(filter-out current,$(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 := $(renderscript_target_api)

$(rs_generated_src_jar): PRIVATE_RS_TARGET_API := $(filter-out current,$(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)

core/package_internal.mk

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ $(R_file_stamp) $(my_res_package): PRIVATE_MANIFEST_INSTRUMENTATION_FOR := $(LOC 


ifeq ($(LOCAL_USE_AAPT2),true)

  my_compiled_res_base_dir := $(intermediates.COMMON)/flat-res

  ifneq (,$(renderscript_target_api))

  ifneq (,$(filter-out current,$(renderscript_target_api)))

    ifneq ($(call math_gt_or_eq,$(renderscript_target_api),21),true)

      my_generated_res_zips := $(rs_generated_res_zip)

    endif  # renderscript_target_api < 21

core/static_java_library.mk

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_INSTRUMENTATION_FOR := 
ifeq ($(LOCAL_USE_AAPT2),true)

  # One more level with name res so we can zip up the flat resources that can be linked by apps.

  my_compiled_res_base_dir := $(intermediates.COMMON)/flat-res/res

  ifneq (,$(renderscript_target_api))

  ifneq (,$(filter-out current,$(renderscript_target_api)))

    ifneq ($(call math_gt_or_eq,$(renderscript_target_api),21),true)

      my_generated_res_zips := $(rs_generated_res_zip)

    endif  # renderscript_target_api < 21