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

am 92e2d3e2: am 6ef046c8: Fixes ProGuard options. 

Merge commit '92e2d3e206a301a090d90e8c61d85e88fdc35a71' into eclair-mr2-plus-aosp

* commit '92e2d3e206a301a090d90e8c61d85e88fdc35a71':
  Fixes ProGuard options.
This commit is contained in:
Ying Wang 2009-12-10 17:52:12 -08:00 committed by Android Git Automerger
parent c9806cfd31 92e2d3e206
commit baefd2480f
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) LOCAL_JAVA_LIBRARIES := core ext framework $(LOCAL_JAVA_LIBRARIES)
endif endif
endif endif
LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))
LOCAL_BUILT_MODULE_STEM := $(strip $(LOCAL_BUILT_MODULE_STEM)) LOCAL_BUILT_MODULE_STEM := $(strip $(LOCAL_BUILT_MODULE_STEM))
ifeq ($(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)) 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 # If no assets or resources were found, clear the directory variables so
# we don't try to build them. # we don't try to build them.
ifeq (,$(all_assets)) ifeq (,$(all_assets))
@ -104,7 +105,6 @@ else
# Make sure that R_file_stamp inherits the proper PRIVATE vars. # Make sure that R_file_stamp inherits the proper PRIVATE vars.
# If R.stamp moves, be sure to update the framework makefile, # If R.stamp moves, be sure to update the framework makefile,
# which has intimate knowledge of its location. # 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 R_file_stamp := $(package_expected_intermediates_COMMON)/src/R.stamp
LOCAL_INTERMEDIATE_TARGETS += $(R_file_stamp) LOCAL_INTERMEDIATE_TARGETS += $(R_file_stamp)
endif endif