diff options
| author | Ying Wang <wangying@google.com> | 2014-03-25 14:42:46 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-03-25 14:42:46 -0700 |
| commit | dbe23f5d987fac0488ae385478ea2ddf1b8c41ae (patch) | |
| tree | 0300ac045580ac94890f17c613ddabe67f64f00b /core/package_internal.mk | |
| parent | ab589ea6ebfa3f93aaac055806dd37e45c1c2ab6 (diff) | |
| download | build-dbe23f5d987fac0488ae385478ea2ddf1b8c41ae.zip build-dbe23f5d987fac0488ae385478ea2ddf1b8c41ae.tar.gz build-dbe23f5d987fac0488ae385478ea2ddf1b8c41ae.tar.bz2 | |
Set up dependency of resource_export_package
The rules to build $(resource_export_package) need also the
framework-res's and potentially other shared libraries' package-export.apks.
Change-Id: I9ff10c621917ba7eed2da11a51cd2426845ad9be
Diffstat (limited to 'core/package_internal.mk')
| -rw-r--r-- | core/package_internal.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index ac0268f..4819a64 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -233,6 +233,7 @@ $(R_file_stamp): $(all_res_assets) $(full_android_manifest) $(RenderScript_file_ $(proguard_options_file): $(R_file_stamp) +resource_export_package := ifdef LOCAL_EXPORT_PACKAGE_RESOURCES # Put this module's resources into a PRODUCT-agnositc package that # 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),\ $(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): \ PRIVATE_AAPT_INCLUDES := $(all_library_res_package_exports) endif # LOCAL_NO_STANDARD_LIBRARIES |