diff options
| author | Ying Wang <wangying@google.com> | 2014-06-19 16:07:30 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-06-19 16:07:30 -0700 |
| commit | b574564f2efcabc7fef80b32b659007a696d1d22 (patch) | |
| tree | 7c51d4f7d5fbe5757fad3bd775ad259d49bf2673 /core/package_internal.mk | |
| parent | c8bdce1a725de6ffe5fd8fd73a2e1ee3541f28dc (diff) | |
| download | build-b574564f2efcabc7fef80b32b659007a696d1d22.zip build-b574564f2efcabc7fef80b32b659007a696d1d22.tar.gz build-b574564f2efcabc7fef80b32b659007a696d1d22.tar.bz2 | |
Reinforce the dependency on package-export.apk.
This fixes the bug that if an app has no resource at all, we should
still set up the dependency on package-export.apk, because the
AndroidManifest.xml may still reference symbols in package-export.apk.
Change-Id: Idb3f12abf55c04824da5b666fe7c49694e227e2c
Diffstat (limited to 'core/package_internal.mk')
| -rw-r--r-- | core/package_internal.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/package_internal.mk b/core/package_internal.mk index d2681e5..ce9d67d 100644 --- a/core/package_internal.mk +++ b/core/package_internal.mk @@ -297,7 +297,7 @@ all_library_res_package_export_deps := \ $(foreach lib,$(LOCAL_RES_LIBRARIES),\ $(call intermediates-dir-for,APPS,$(lib),,COMMON)/src/R.stamp) -$(resource_export_package) $(R_file_stamp): $(all_library_res_package_export_deps) +$(resource_export_package) $(R_file_stamp) $(LOCAL_BUILT_MODULE): $(all_library_res_package_export_deps) $(LOCAL_INTERMEDIATE_TARGETS): \ PRIVATE_AAPT_INCLUDES := $(all_library_res_package_exports) endif # LOCAL_NO_STANDARD_LIBRARIES |