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

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

Remove obsolete leaf names 

classes-no-debug-var.jar is incorrect, jars in coverage builds
do have debug information.  Remove full_classes_compiled_jar_leaf
and hardcode classes-full-debug.jar.

After the previous patch, all dex files have debug information,
so remove the no-local and with-local directories and replace
them with dex/.

Remove the unnecessary jarjar_leaf.

Bug: 70886092
Test: m checkbuild
Change-Id: I63eace8f8cda5ad8bc0cbd11eefda73dd063ed76
parent ff812829

CleanSpec.mk

+6 −0
Original line number Diff line number Diff line
@@ -450,6 +450,12 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib/vndk-sp) 
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/vndk)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/lib64/vndk-sp)



# Remove old dex output directories

$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/*/*_intermediates/with-local/)

$(call add-clean-step, rm -rf $(TARGET_OUT_COMMON_INTERMEDIATES)/*/*_intermediates/no-local/)

$(call add-clean-step, rm -rf $(HOST_OUT_COMMON_INTERMEDIATES)/*/*_intermediates/with-local/)

$(call add-clean-step, rm -rf $(HOST_OUT_COMMON_INTERMEDIATES)/*/*_intermediates/no-local/)



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

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

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

core/java.mk

+3 −13
Original line number Diff line number Diff line
@@ -59,15 +59,6 @@ endif 
intermediates := $(call local-intermediates-dir)

intermediates.COMMON := $(call local-intermediates-dir,COMMON)



# Choose leaf name for the compiled jar file.

ifeq ($(LOCAL_EMMA_INSTRUMENT),true)

full_classes_compiled_jar_leaf := classes-no-debug-var.jar

built_dex_intermediate_leaf := no-local

else

full_classes_compiled_jar_leaf := classes-full-debug.jar

built_dex_intermediate_leaf := with-local

endif



ifeq ($(LOCAL_PROGUARD_ENABLED),disabled)

LOCAL_PROGUARD_ENABLED :=

endif
@@ -75,14 +66,13 @@ endif 
full_classes_turbine_jar := $(intermediates.COMMON)/classes-turbine.jar

full_classes_header_jarjar := $(intermediates.COMMON)/classes-header-jarjar.jar

full_classes_header_jar := $(intermediates.COMMON)/classes-header.jar

full_classes_compiled_jar := $(intermediates.COMMON)/$(full_classes_compiled_jar_leaf)

full_classes_compiled_jar := $(intermediates.COMMON)/classes-full-debug.jar

full_classes_processed_jar := $(intermediates.COMMON)/classes-processed.jar

full_classes_desugar_jar := $(intermediates.COMMON)/classes-desugar.jar

jarjar_leaf := classes-jarjar.jar

full_classes_jarjar_jar := $(intermediates.COMMON)/$(jarjar_leaf)

full_classes_jarjar_jar := $(intermediates.COMMON)/classes-jarjar.jar

full_classes_proguard_jar := $(intermediates.COMMON)/classes-proguard.jar

full_classes_combined_jar := $(intermediates.COMMON)/classes-combined.jar

built_dex_intermediate := $(intermediates.COMMON)/$(built_dex_intermediate_leaf)/classes.dex

built_dex_intermediate := $(intermediates.COMMON)/dex/classes.dex

full_classes_stubs_jar := $(intermediates.COMMON)/stubs.jar

java_source_list_file := $(intermediates.COMMON)/java-source-list