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

Merge "Temporarily use a separate var for including shared resources"

This commit is contained in:
Adam Lesinski 2014-03-26 00:41:00 +00:00 committed by Android (Google) Code Review
parent c93c10a75b 5eebe0f1b4
commit 9d9dbaba77
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/base_rules.mk
View File

@ -430,10 +430,10 @@ full_java_lib_deps += $(full_static_java_libs) $(LOCAL_CLASSPATH)
# This is set by packages that are linking to other packages that export # This is set by packages that are linking to other packages that export
# shared libraries, allowing them to make use of the code in the linked apk. # shared libraries, allowing them to make use of the code in the linked apk.
LOCAL_APK_LIBRARIES := $(strip $(LOCAL_APK_LIBRARIES)) apk_libraries := $(sort $(LOCAL_APK_LIBRARIES) $(LOCAL_RES_LIBRARIES))
ifdef LOCAL_APK_LIBRARIES ifneq ($(apk_libraries),)
link_apk_libraries := \ link_apk_libraries := \
$(foreach lib,$(LOCAL_APK_LIBRARIES), \ $(foreach lib,$(apk_libraries), \
$(call intermediates-dir-for, \ $(call intermediates-dir-for, \
APPS,$(lib),,COMMON)/classes.jar) APPS,$(lib),,COMMON)/classes.jar)

1
core/clear_vars.mk
View File

@ -90,6 +90,7 @@ LOCAL_JNI_SHARED_LIBRARIES_ABI:=
LOCAL_JAR_MANIFEST:= LOCAL_JAR_MANIFEST:=
LOCAL_INSTRUMENTATION_FOR:= LOCAL_INSTRUMENTATION_FOR:=
LOCAL_APK_LIBRARIES:= LOCAL_APK_LIBRARIES:=
LOCAL_RES_LIBRARIES:=
LOCAL_MANIFEST_INSTRUMENTATION_FOR:= LOCAL_MANIFEST_INSTRUMENTATION_FOR:=
LOCAL_AIDL_INCLUDES:= LOCAL_AIDL_INCLUDES:=
LOCAL_JARJAR_RULES:= LOCAL_JARJAR_RULES:=

4
core/package_internal.mk
View File

@ -289,12 +289,12 @@ framework_res_package_export_deps := \
endif # LOCAL_SDK_RES_VERSION endif # LOCAL_SDK_RES_VERSION
all_library_res_package_exports := \ all_library_res_package_exports := \
$(framework_res_package_export) \ $(framework_res_package_export) \
$(foreach lib,$(LOCAL_APK_LIBRARIES),\ $(foreach lib,$(LOCAL_RES_LIBRARIES),\
$(call intermediates-dir-for,APPS,$(lib),,COMMON)/package-export.apk) $(call intermediates-dir-for,APPS,$(lib),,COMMON)/package-export.apk)
all_library_res_package_export_deps := \ all_library_res_package_export_deps := \
$(framework_res_package_export_deps) \ $(framework_res_package_export_deps) \
$(foreach lib,$(LOCAL_APK_LIBRARIES),\ $(foreach lib,$(LOCAL_RES_LIBRARIES),\
$(call intermediates-dir-for,APPS,$(lib),,COMMON)/src/R.stamp) $(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): $(all_library_res_package_export_deps)