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

Commit 6b68da06 authored by Yang Ni's avatar Yang Ni
Browse files

Do not package res unless RS target API < 21 

Bug: 37626838

Since Lollipop, RS generated bitcode is embedded as strings in
generated Java files, and no longer needed in the resources.
This CL makes packaging resources conditional on RS target API, and
not do so unless it is below 21.

Test: mm in frameworks/rs/tests/java_api/Refocus, ImageProcessing2, and
      ImageProcessing_jb
Change-Id: I79a90ed4b96cb78b22a64a35b539d9d67351f4c4
(cherry picked from commit e2c09019)
parent f1ec8ac2

core/package_internal.mk

+15 −0
Original line number Diff line number Diff line
@@ -367,8 +367,23 @@ endif # LOCAL_DATA_BINDING 
ifeq ($(need_compile_res),true)

ifdef LOCAL_USE_AAPT2

my_compiled_res_base_dir := $(intermediates)/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, $(LOCAL_SDK_VERSION)))

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

my_generated_res_dirs_deps := $(RenderScript_file_stamp)

endif  # renderscript_target_api < 21

endif  # renderscript_target_api is set

# Add AAPT2 link specific flags.

$(my_res_package): PRIVATE_AAPT_FLAGS := $(LOCAL_AAPT_FLAGS) --no-static-lib-packages

include $(BUILD_SYSTEM)/aapt2.mk

core/static_java_library.mk

+15 −0
Original line number Diff line number Diff line
@@ -149,8 +149,23 @@ $(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, $(LOCAL_SDK_VERSION)))

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

my_generated_res_dirs_deps := $(RenderScript_file_stamp)

endif  # renderscript_target_api < 21

endif  # renderscript_target_api is set

include $(BUILD_SYSTEM)/aapt2.mk

$(my_res_package) : $(framework_res_package_export_deps)

else