commit 6ef046c8932989ca97d1cb39413ef99761315a06
author Ying Wang <wangying@google.com> Mon Dec 07 18:14:00 2009 -0800
committer Ying Wang <wangying@google.com> Wed Dec 09 14:31:22 2009 -0800
tree 461350c6913c9d7dc82306bbe6ab3bdaa993c4b9
parent 9b0ad4c7258b586f1763bc497e8ed33f42ce446e

Fixes ProGuard options.

1. Dedup LOCAL_JAVA_LIBRARIES.
2. Even no resource or asset for a package, we still need to set
package_expected_intermediates_COMMON, which is anyway used by ProGuard.

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index 19b4d63..ddb8737 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -28,6 +28,7 @@
     LOCAL_JAVA_LIBRARIES := core ext framework $(LOCAL_JAVA_LIBRARIES)
   endif
 endif
+LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))
 
 LOCAL_BUILT_MODULE_STEM := $(strip $(LOCAL_BUILT_MODULE_STEM))
 ifeq ($(LOCAL_BUILT_MODULE_STEM),)