StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 3057adba: Drop the [no]proguard. prefix for the intermediate targets

Browse Source 
* commit '3057adbace1eb57cd73f982eb06d897632ece554':
  Drop the [no]proguard. prefix for the intermediate targets
This commit is contained in:
Ying Wang
2013-09-12 21:37:25 -07:00
committed by Android Git Automerger
parent 0e50619ad2 3057adbace
commit 8639f2dda2
1 changed files with 1 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/java.mk
View File

@@ -82,18 +82,10 @@ ifeq ($(LOCAL_PROGUARD_ENABLED),disabled)
LOCAL_PROGUARD_ENABLED := LOCAL_PROGUARD_ENABLED :=
endif 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 ifdef LOCAL_PROGUARD_ENABLED
proguard_jar_leaf := proguard.classes.jar proguard_jar_leaf := proguard.classes.jar
built_dex_intermediate_leaf := proguard.$(built_dex_intermediate_leaf)
built_dex_leaf := proguard.classes.dex
else else
proguard_jar_leaf := noproguard.classes.jar proguard_jar_leaf := noproguard.classes.jar
built_dex_intermediate_leaf := noproguard.$(built_dex_intermediate_leaf)
built_dex_leaf := noproguard.classes.dex
endif endif
full_classes_compiled_jar := $(intermediates.COMMON)/$(full_classes_compiled_jar_leaf) full_classes_compiled_jar := $(intermediates.COMMON)/$(full_classes_compiled_jar_leaf)
@@ -113,7 +105,7 @@ full_classes_jar :=
built_dex := built_dex :=
else else
full_classes_jar := $(intermediates.COMMON)/classes.jar full_classes_jar := $(intermediates.COMMON)/classes.jar
built_dex := $(intermediates.COMMON)/$(built_dex_leaf) built_dex := $(intermediates.COMMON)/classes.dex
endif endif
LOCAL_INTERMEDIATE_TARGETS += \ LOCAL_INTERMEDIATE_TARGETS += \
@@ -304,14 +296,6 @@ $(cleantarget): PRIVATE_CLEAN_FILES += $(intermediates.COMMON)
ifdef full_classes_jar 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 # 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 # 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. # against, for the cases where someone needs the jar to link against.