p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add LOCAL_APK_LIBRARIES to the AAPT -I flag 

Change-Id: I5c5c90de3c8ce6c224b6e3fbf42d5e72cfd7a4d1
This commit is contained in:
Adam Lesinski 2014-03-13 18:48:27 -07:00
parent a5fdf90bb7
commit de057c3063
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/package_internal.mk
View File

@ -286,9 +286,19 @@ framework_res_package_export := \
framework_res_package_export_deps := \
$(dir $(framework_res_package_export))src/R.stamp
endif # LOCAL_SDK_RES_VERSION
$(R_file_stamp): $(framework_res_package_export_deps)
all_library_res_package_exports := \
$(framework_res_package_export) \
$(foreach lib,$(LOCAL_APK_LIBRARIES),\
$(call intermediates-dir-for,APPS,$(lib),,COMMON)/package-export.apk)
all_library_res_package_export_deps := \
$(framework_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)
$(LOCAL_INTERMEDIATE_TARGETS): \
PRIVATE_AAPT_INCLUDES := $(framework_res_package_export)
PRIVATE_AAPT_INCLUDES := $(all_library_res_package_exports)
endif # LOCAL_NO_STANDARD_LIBRARIES
ifneq ($(full_classes_jar),)