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

Commit e00e2fae authored by Colin Cross's avatar Colin Cross
Browse files

Use srcjar and resource zip as output of renderscript rules 

Replace RenderScript.stamp with a srcjar, with a resource zip as
an implicit output.  This makes the renderscript rules self contained,
which will make it easier to move them before aapt.

Bug: 73885582
Test: m checkbuild
Change-Id: I12d33e52019aebac6ea33271939228e4690a4173
parent 3e455015

CleanSpec.mk

+3 −0
Original line number Original line Diff line number Diff line
@@ -467,6 +467,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/compatibility_matrix.xml) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay/DisplayCutoutEmulationWide)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay/DisplayCutoutEmulationWide)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay/DisplayCutoutEmulationNarrow)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/overlay/DisplayCutoutEmulationNarrow)





# Remove obsolete intermedates src files

$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/*/*_intermediates/src/RenderScript.stamp*)



# ************************************************

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************
 
# ************************************************

core/definitions.mk

+2 −4
Original line number Original line Diff line number Diff line
@@ -1036,9 +1036,9 @@ $(hide) $(RS_CC_ASAN_OPTIONS) $(PRIVATE_RS_CC) \ 
  $(PRIVATE_RS_FLAGS) \

  $(PRIVATE_RS_FLAGS) \

  $(foreach inc,$(PRIVATE_RS_INCLUDES),$(addprefix -I , $(inc))) \

  $(foreach inc,$(PRIVATE_RS_INCLUDES),$(addprefix -I , $(inc))) \

  $(PRIVATE_RS_SOURCE_FILES)

  $(PRIVATE_RS_SOURCE_FILES)

$(SOONG_ZIP) -o $@ -C $(PRIVATE_RS_OUTPUT_DIR)/src -D $(PRIVATE_RS_OUTPUT_DIR)/src

$(SOONG_ZIP) -o $(PRIVATE_RS_OUTPUT_RES_ZIP) -C $(PRIVATE_RS_OUTPUT_DIR)/res -D $(PRIVATE_RS_OUTPUT_DIR)/res

$(call _merge-renderscript-d,$(PRIVATE_DEP_FILES),$@.d)

$(call _merge-renderscript-d,$(PRIVATE_DEP_FILES),$@.d)

$(hide) mkdir -p $(dir $@)

$(hide) touch $@

endef

endef





define transform-bc-to-so

define transform-bc-to-so
@@ -2212,8 +2212,6 @@ $(hide) if [ -d "$(PRIVATE_SOURCE_INTERMEDIATES_DIR)" ]; then \ 
fi

fi

$(if $(PRIVATE_HAS_PROTO_SOURCES), \

$(if $(PRIVATE_HAS_PROTO_SOURCES), \

    $(hide) find $(PRIVATE_PROTO_SOURCE_INTERMEDIATES_DIR) -name '*.java' -and -not -name '.*' >> $(1))

    $(hide) find $(PRIVATE_PROTO_SOURCE_INTERMEDIATES_DIR) -name '*.java' -and -not -name '.*' >> $(1))

$(if $(PRIVATE_HAS_RS_SOURCES), \

    $(hide) find $(PRIVATE_RS_SOURCE_INTERMEDIATES_DIR) -name '*.java' -and -not -name '.*' >> $(1))

endef

endef





# Some historical notes:

# Some historical notes:

core/java.mk

+21 −25
Original line number Original line Diff line number Diff line
@@ -110,15 +110,16 @@ LOCAL_INTERMEDIATE_SOURCE_DIR := $(intermediates.COMMON)/src 
## .rs files: RenderScript sources to .java files and .bc files

## .rs files: RenderScript sources to .java files and .bc files

###############################################################

###############################################################

renderscript_sources := $(filter %.rs,$(LOCAL_SRC_FILES))

renderscript_sources := $(filter %.rs,$(LOCAL_SRC_FILES))

# Because names of the java files from RenderScript are unknown until the

rs_generated_res_zip :=

# .rs file(s) are compiled, we have to depend on a timestamp file.

rs_generated_src_jar :=

RenderScript_file_stamp :=

rs_generated_res_dir :=

rs_compatibility_jni_libs :=

rs_compatibility_jni_libs :=

ifneq ($(renderscript_sources),)

ifneq ($(renderscript_sources),)

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

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

RenderScript_file_stamp := $(LOCAL_INTERMEDIATE_SOURCE_DIR)/RenderScript.stamp

renderscript_intermediate.COMMON := $(intermediates.COMMON)/renderscript

renderscript_intermediate.COMMON := $(intermediates.COMMON)/renderscript

rs_generated_res_zip := $(renderscript_intermediate.COMMON)/res.zip

rs_generated_src_jar := $(renderscript_intermediate.COMMON)/rs.srcjar



LOCAL_SRCJARS += $(rs_generated_src_jar)





# Defaulting to an empty string uses the latest available platform SDK.

# Defaulting to an empty string uses the latest available platform SDK.

renderscript_target_api :=

renderscript_target_api :=
@@ -173,20 +174,20 @@ endif 
bc_files := $(patsubst %.rs,%.bc, $(notdir $(renderscript_sources)))

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

bc_dep_files := $(addprefix $(renderscript_intermediate.COMMON)/,$(patsubst %.bc,%.d,$(bc_files)))

bc_dep_files := $(addprefix $(renderscript_intermediate.COMMON)/,$(patsubst %.bc,%.d,$(bc_files)))





$(RenderScript_file_stamp): PRIVATE_RS_INCLUDES := $(LOCAL_RENDERSCRIPT_INCLUDES)

$(rs_generated_src_jar): PRIVATE_RS_INCLUDES := $(LOCAL_RENDERSCRIPT_INCLUDES)

$(RenderScript_file_stamp): PRIVATE_RS_CC := $(LOCAL_RENDERSCRIPT_CC)

$(rs_generated_src_jar): PRIVATE_RS_CC := $(LOCAL_RENDERSCRIPT_CC)

$(RenderScript_file_stamp): PRIVATE_RS_FLAGS := $(renderscript_flags)

$(rs_generated_src_jar): PRIVATE_RS_FLAGS := $(renderscript_flags)

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

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

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

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

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

$(rs_generated_src_jar): PRIVATE_RS_TARGET_API := $(renderscript_target_api)

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

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

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

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

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

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

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

$(rs_generated_src_jar): $(renderscript_sources_fullpath) $(LOCAL_RENDERSCRIPT_CC) $(SOONG_ZIP)

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

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





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

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

$(call include-depfile,$(RenderScript_file_stamp).P,$(RenderScript_file_stamp))

$(call include-depfile,$(rs_generated_src_jar).P,$(rs_generated_src_jar))





ifneq ($(LOCAL_RENDERSCRIPT_COMPATIBILITY),)

ifneq ($(LOCAL_RENDERSCRIPT_COMPATIBILITY),)
@@ -219,7 +220,7 @@ rs_compatibility_jni_libs := $(addprefix \ 
    $(renderscript_intermediate)/librs., \

    $(renderscript_intermediate)/librs., \

    $(patsubst %.bc,%.so, $(bc_files)))

    $(patsubst %.bc,%.so, $(bc_files)))





$(rs_generated_bc) : $(RenderScript_file_stamp)

$(rs_generated_src_jar): .KATI_IMPLICIT_OUTPUTS += $(rs_generated_bc)





rs_support_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/libRSSupport.so

rs_support_lib := $(TARGET_OUT_INTERMEDIATE_LIBRARIES)/libRSSupport.so

LOCAL_JNI_SHARED_LIBRARIES += libRSSupport

LOCAL_JNI_SHARED_LIBRARIES += libRSSupport
@@ -238,7 +239,7 @@ else 
  my_min_sdk_version := $(MIN_SUPPORTED_SDK_VERSION)

  my_min_sdk_version := $(MIN_SUPPORTED_SDK_VERSION)

endif

endif





$(rs_compatibility_jni_libs): $(RenderScript_file_stamp) $(RS_PREBUILT_CLCORE) \

$(rs_compatibility_jni_libs): $(RS_PREBUILT_CLCORE) \

    $(rs_support_lib) $(rs_support_io_lib) $(rs_jni_lib) $(rs_compiler_rt)

    $(rs_support_lib) $(rs_support_io_lib) $(rs_jni_lib) $(rs_compiler_rt)

$(rs_compatibility_jni_libs): $(BCC_COMPAT)

$(rs_compatibility_jni_libs): $(BCC_COMPAT)

$(rs_compatibility_jni_libs): PRIVATE_CXX := $(CXX_WRAPPER) $(TARGET_CXX)

$(rs_compatibility_jni_libs): PRIVATE_CXX := $(CXX_WRAPPER) $(TARGET_CXX)
@@ -252,10 +253,9 @@ endif 




endif

endif





LOCAL_INTERMEDIATE_TARGETS += $(RenderScript_file_stamp)

LOCAL_INTERMEDIATE_TARGETS += $(rs_generated_src_jar)

# Make sure the generated resource will be added to the apk.

# Make sure the generated resource will be added to the apk.

rs_generated_res_dir := $(renderscript_intermediate.COMMON)/res

LOCAL_RESOURCE_DIR := $(renderscript_intermediate.COMMON)/res $(LOCAL_RESOURCE_DIR)

LOCAL_RESOURCE_DIR := $(rs_generated_res_dir) $(LOCAL_RESOURCE_DIR)

endif

endif
@@ -334,9 +334,6 @@ include $(BUILD_SYSTEM)/java_common.mk 




include $(BUILD_SYSTEM)/sdk_check.mk

include $(BUILD_SYSTEM)/sdk_check.mk





$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_HAS_RS_SOURCES := $(if $(renderscript_sources),true)

$(LOCAL_INTERMEDIATE_TARGETS): PRIVATE_RS_SOURCE_INTERMEDIATES_DIR := $(intermediates.COMMON)/renderscript



# Set the profile source so that the odex / profile code included from java.mk

# Set the profile source so that the odex / profile code included from java.mk

# can find it.

# can find it.

#

#
@@ -403,7 +400,6 @@ endif 
java_sources_deps := \

java_sources_deps := \

    $(java_sources) \

    $(java_sources) \

    $(java_resource_sources) \

    $(java_resource_sources) \

    $(RenderScript_file_stamp) \

    $(proto_java_sources_file_stamp) \

    $(proto_java_sources_file_stamp) \

    $(LOCAL_SRCJARS) \

    $(LOCAL_SRCJARS) \

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

    $(LOCAL_ADDITIONAL_DEPENDENCIES)

core/package_internal.mk

+2 −3
Original line number Original line Diff line number Diff line
@@ -405,8 +405,7 @@ endif # LOCAL_SDK_VERSION is set 
endif  # LOCAL_RENDERSCRIPT_TARGET_API is set

endif  # LOCAL_RENDERSCRIPT_TARGET_API is set

ifneq (,$(renderscript_target_api))

ifneq (,$(renderscript_target_api))

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

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

my_generated_res_dirs := $(rs_generated_res_dir)

my_generated_res_zips := $(rs_generated_res_zip)

my_generated_res_dirs_deps := $(RenderScript_file_stamp)

endif  # renderscript_target_api < 21

endif  # renderscript_target_api < 21

endif  # renderscript_target_api is set

endif  # renderscript_target_api is set

my_asset_dirs := $(LOCAL_ASSET_DIR)

my_asset_dirs := $(LOCAL_ASSET_DIR)
@@ -434,7 +433,7 @@ $(R_file_stamp): PRIVATE_RESOURCE_PUBLICS_OUTPUT := \ 
			$(intermediates.COMMON)/public_resources.xml

			$(intermediates.COMMON)/public_resources.xml

$(R_file_stamp): PRIVATE_PROGUARD_OPTIONS_FILE := $(proguard_options_file)

$(R_file_stamp): PRIVATE_PROGUARD_OPTIONS_FILE := $(proguard_options_file)

$(R_file_stamp): PRIVATE_RESOURCE_LIST := $(all_res_assets)

$(R_file_stamp): PRIVATE_RESOURCE_LIST := $(all_res_assets)

$(R_file_stamp): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_stamp) $(AAPT) | $(ACP)

$(R_file_stamp): $(all_res_assets) $(full_android_manifest) $(rs_generated_res_zip) $(AAPT) | $(ACP)

	@echo "target R.java/Manifest.java: $(PRIVATE_MODULE) ($@)"

	@echo "target R.java/Manifest.java: $(PRIVATE_MODULE) ($@)"

	@rm -rf $@ && mkdir -p $(dir $@)

	@rm -rf $@ && mkdir -p $(dir $@)

	$(create-resource-java-files)

	$(create-resource-java-files)

core/static_java_library.mk

+2 −3
Original line number Original line Diff line number Diff line
@@ -174,15 +174,14 @@ endif # LOCAL_SDK_VERSION is set 
endif  # LOCAL_RENDERSCRIPT_TARGET_API is set

endif  # LOCAL_RENDERSCRIPT_TARGET_API is set

ifneq (,$(renderscript_target_api))

ifneq (,$(renderscript_target_api))

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

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

my_generated_res_dirs := $(rs_generated_res_dir)

my_generated_res_zips := $(rs_generated_res_zip)

my_generated_res_dirs_deps := $(RenderScript_file_stamp)

endif  # renderscript_target_api < 21

endif  # renderscript_target_api < 21

endif  # renderscript_target_api is set

endif  # renderscript_target_api is set

include $(BUILD_SYSTEM)/aapt2.mk

include $(BUILD_SYSTEM)/aapt2.mk

$(my_res_package) : $(framework_res_package_export)

$(my_res_package) : $(framework_res_package_export)

else

else

$(R_file_stamp): PRIVATE_RESOURCE_LIST := $(all_resources)

$(R_file_stamp): PRIVATE_RESOURCE_LIST := $(all_resources)

$(R_file_stamp) : $(all_resources) $(full_android_manifest) $(AAPT) $(framework_res_package_export)

$(R_file_stamp) : $(all_resources) $(full_android_manifest) $(AAPT) $(framework_res_package_export) $(rs_generated_res_zip)

	@echo "target R.java/Manifest.java: $(PRIVATE_MODULE) ($@)"

	@echo "target R.java/Manifest.java: $(PRIVATE_MODULE) ($@)"

	$(create-resource-java-files)

	$(create-resource-java-files)

	$(hide) find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name R.java | xargs cat > $@

	$(hide) find $(PRIVATE_SOURCE_INTERMEDIATES_DIR) -name R.java | xargs cat > $@