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

Commit 3057adba authored by Ying Wang's avatar Ying Wang
Browse files

Drop the [no]proguard. prefix for the intermediate targets 

Since we have enabled Progaurd for all build variants, we don't need the
different naming scheme along the path to make incremental build work
properly when you switch build variant.
As a result, this fixes the nothing-to-do-do-build-gets-something-build bug
introduced by the multi-dex change.

Change-Id: I907ff13091013d28910b0aa190b9218144385132
parent 3938f3e1

core/java.mk

+1 −17
Original line number Diff line number Diff line
@@ -82,18 +82,10 @@ ifeq ($(LOCAL_PROGUARD_ENABLED),disabled) 
LOCAL_PROGUARD_ENABLED :=

endif



# By giving different file name, files can be updated correctly when switching

# between builds with and without Proguard enabled.

# Note that ANY intermediate targets between the proguard and

# the final built_dex should be differently named!

ifdef LOCAL_PROGUARD_ENABLED

proguard_jar_leaf := proguard.classes.jar

built_dex_intermediate_leaf := proguard.$(built_dex_intermediate_leaf)

built_dex_leaf := proguard.classes.dex

else

proguard_jar_leaf := noproguard.classes.jar

built_dex_intermediate_leaf := noproguard.$(built_dex_intermediate_leaf)

built_dex_leaf := noproguard.classes.dex

endif



full_classes_compiled_jar := $(intermediates.COMMON)/$(full_classes_compiled_jar_leaf)
@@ -113,7 +105,7 @@ full_classes_jar := 
built_dex :=

else

full_classes_jar := $(intermediates.COMMON)/classes.jar

built_dex := $(intermediates.COMMON)/$(built_dex_leaf)

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

endif



LOCAL_INTERMEDIATE_TARGETS += \
@@ -304,14 +296,6 @@ $(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON) 


ifdef full_classes_jar



# If LOCAL_BUILT_MODULE_STEM wasn't overridden by our caller,

# full_classes_jar will be the same module as LOCAL_BUILT_MODULE.

# Otherwise, the caller will define it as a prerequisite of

# LOCAL_BUILT_MODULE, so it will inherit the necessary PRIVATE_*

# variable definitions.

full_classes_jar := $(intermediates.COMMON)/classes.jar

built_dex := $(intermediates.COMMON)/$(built_dex_leaf)



# Droiddoc isn't currently able to generate stubs for modules, so we're just

# allowing it to use the classes.jar as the "stubs" that would be use to link

# against, for the cases where someone needs the jar to link against.