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

Commit 55cce233 authored Mar 13, 2018 by Colin Cross

Remove redundant renderscript_target_api computation

renderscript_target_api is set by java_renderscript.mk, it doesn't
need to be computed again in static_java_library.mk and
package_internal.mk.

Bug: 73885582
Test: no change to ninja file
Change-Id: Ib6e00be425c385f4911def19ed5042a740f2c79b

parent 71822d6f

core/package_internal.mk

+0 −11

Original line number	Diff line number	Diff line
		@@ -392,17 +392,6 @@ endif

		ifdef LOCAL_USE_AAPT2
		my_compiled_res_base_dir := $(intermediates.COMMON)/flat-res
		renderscript_target_api :=
		ifneq (,$(LOCAL_RENDERSCRIPT_TARGET_API))
		renderscript_target_api := $(LOCAL_RENDERSCRIPT_TARGET_API)
		else
		ifneq (,$(LOCAL_SDK_VERSION))
		# Set target-api for LOCAL_SDK_VERSIONs other than current.
		ifneq (,$(filter-out current system_current test_current core_current, $(LOCAL_SDK_VERSION)))
		renderscript_target_api := $(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION))
		endif
		endif # LOCAL_SDK_VERSION is set
		endif # LOCAL_RENDERSCRIPT_TARGET_API is set
		ifneq (,$(renderscript_target_api))
		ifneq ($(call math_gt_or_eq,$(renderscript_target_api),21),true)
		my_generated_res_zips := $(rs_generated_res_zip)

core/static_java_library.mk

+0 −11

Original line number	Diff line number	Diff line
		@@ -161,17 +161,6 @@ $(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_MANIFEST_INSTRUMENTATION_FOR :=
		ifdef LOCAL_USE_AAPT2
		# 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
		renderscript_target_api :=
		ifneq (,$(LOCAL_RENDERSCRIPT_TARGET_API))
		renderscript_target_api := $(LOCAL_RENDERSCRIPT_TARGET_API)
		else
		ifneq (,$(LOCAL_SDK_VERSION))
		# Set target-api for LOCAL_SDK_VERSIONs other than current.
		ifneq (,$(filter-out current system_current test_current core_current, $(LOCAL_SDK_VERSION)))
		renderscript_target_api := $(call get-numeric-sdk-version,$(LOCAL_SDK_VERSION))
		endif
		endif # LOCAL_SDK_VERSION is set
		endif # LOCAL_RENDERSCRIPT_TARGET_API is set
		ifneq (,$(renderscript_target_api))
		ifneq ($(call math_gt_or_eq,$(renderscript_target_api),21),true)
		my_generated_res_zips := $(rs_generated_res_zip)