commit a9c381ed4517993175a5bb6741ecf2aac3e8040c
author Ying Wang <wangying@google.com> Sat Oct 02 18:35:51 2010 -0700
committer Ying Wang <wangying@google.com> Sat Oct 02 19:41:10 2010 -0700
tree 4b00b0eb465653180543452be8c9a635a7ddc79b
parent a83940fa7851b35712e559be2246b56b5666b805

Any intermediate targets between Progaurd and the built_dex should be differently named.

Change-Id: Ifb01b1fcf24ba0c5b98aa02dd604cd81918e1841

To do that, we have to move classes.jar step before proguard, so classes.jar is always with the full names.

core/base_rules.mk

diff --git a/core/base_rules.mk b/core/base_rules.mk
index 0505f83..5bb6b77 100644
--- a/core/base_rules.mk
+++ b/core/base_rules.mk
@@ -403,8 +403,8 @@
       APPS,$(LOCAL_INSTRUMENTATION_FOR),,COMMON)
 
   # link against the jar with full original names (before proguard processing).
-  full_java_libs += $(link_instr_intermediates_dir.COMMON)/classes-full-names.jar
-  full_java_lib_deps += $(link_instr_intermediates_dir.COMMON)/classes-full-names.jar
+  full_java_libs += $(link_instr_intermediates_dir.COMMON)/classes.jar
+  full_java_lib_deps += $(link_instr_intermediates_dir.COMMON)/classes.jar
 endif
 
 ifneq ($(strip $(LOCAL_JAR_MANIFEST)),)