StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Set up dependency of resource_export_package

Browse Source 
The rules to build $(resource_export_package) need also the
framework-res's and potentially other shared libraries' package-export.apks.

Change-Id: I9ff10c621917ba7eed2da11a51cd2426845ad9be
This commit is contained in:
Ying Wang
2014-03-25 14:42:46 -07:00
parent ab589ea6eb
commit dbe23f5d98
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/package_internal.mk
View File

@@ -233,6 +233,7 @@ $(R_file_stamp): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_
$(proguard_options_file): $(R_file_stamp) $(proguard_options_file): $(R_file_stamp)
resource_export_package :=
ifdef LOCAL_EXPORT_PACKAGE_RESOURCES ifdef LOCAL_EXPORT_PACKAGE_RESOURCES
# Put this module's resources into a PRODUCT-agnositc package that # Put this module's resources into a PRODUCT-agnositc package that
# other packages can use to build their own PRODUCT-agnostic R.java (etc.) # other packages can use to build their own PRODUCT-agnostic R.java (etc.)
@@ -296,7 +297,7 @@ all_library_res_package_export_deps := \
$(foreach lib,$(LOCAL_APK_LIBRARIES),\ $(foreach lib,$(LOCAL_APK_LIBRARIES),\
$(call intermediates-dir-for,APPS,$(lib),,COMMON)/src/R.stamp) $(call intermediates-dir-for,APPS,$(lib),,COMMON)/src/R.stamp)
$(R_file_stamp): $(all_library_res_package_export_deps) $(resource_export_package) $(R_file_stamp): $(all_library_res_package_export_deps)
$(LOCAL_INTERMEDIATE_TARGETS): \ $(LOCAL_INTERMEDIATE_TARGETS): \
PRIVATE_AAPT_INCLUDES := $(all_library_res_package_exports) PRIVATE_AAPT_INCLUDES := $(all_library_res_package_exports)
endif # LOCAL_NO_STANDARD_LIBRARIES endif # LOCAL_NO_STANDARD_LIBRARIES