openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

am 6ef046c8: Fixes ProGuard options. 

Merge commit '6ef046c8932989ca97d1cb39413ef99761315a06' into eclair-mr2

* commit '6ef046c8932989ca97d1cb39413ef99761315a06':
  Fixes ProGuard options.
This commit is contained in:
Ying Wang 2009-12-10 17:39:53 -08:00 committed by Android Git Automerger
parent bbfb96f464 6ef046c893
commit 92e2d3e206
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/java.mk
View File

@ -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),)

2
core/package.mk
View File

@ -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