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.

diff --git a/core/java.mk b/core/java.mk
index 19b4d63..ddb8737 100644 (file)
--- a/core/java.mk
+++ b/core/java.mk
@@ -28,6 +28,7 @@ else
     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),)

diff --git a/core/package.mk b/core/package.mk
index 828f4c7..d92a8b8 100644 (file)
--- a/core/package.mk
+++ b/core/package.mk
@@ -92,6 +92,7 @@ all_resources := $(strip \
 
 all_res_assets := $(strip $(all_assets) $(all_resources))
 
+package_expected_intermediates_COMMON := $(call local-intermediates-dir,COMMON)
 # If no assets or resources were found, clear the directory variables so
 # we don't try to build them.
 ifeq (,$(all_assets))
@@ -104,7 +105,6 @@ else
 # Make sure that R_file_stamp inherits the proper PRIVATE vars.
 # If R.stamp moves, be sure to update the framework makefile,
 # which has intimate knowledge of its location.
-package_expected_intermediates_COMMON := $(call local-intermediates-dir,COMMON)
 R_file_stamp := $(package_expected_intermediates_COMMON)/src/R.stamp
 LOCAL_INTERMEDIATE_TARGETS += $(R_file_stamp)
 endif