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

Don't install all host modules by default. 

Instead we should explicitly set up the dependency, if the module will
be used in the build process; Use LOCAL_MODULE_TAGS with eng, debug or
tests if the module is for testing; or add to PRODUCT_PACKAGES if it's
required by a product.

Change-Id: Ic26319c26c1166bc1062dfbcfb4e006af185249a
This commit is contained in:
Ying Wang 2012-09-05 12:48:52 -07:00
parent 08d56b4a10
commit 2e65cd5510
4 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/Makefile
View File

@ -1454,7 +1454,6 @@ deps := \
$(atree_dir)/sdk.atree \ $(atree_dir)/sdk.atree \
$(sdk_tools_atree_files) \ $(sdk_tools_atree_files) \
$(HOST_OUT_EXECUTABLES)/atree \ $(HOST_OUT_EXECUTABLES)/atree \
$(ALL_HOST_INSTALLED_FILES) \
$(HOST_OUT_EXECUTABLES)/line_endings $(HOST_OUT_EXECUTABLES)/line_endings
INTERNAL_SDK_TARGET := $(sdk_dir)/$(sdk_name).zip INTERNAL_SDK_TARGET := $(sdk_dir)/$(sdk_name).zip

11
core/base_rules.mk
View File

@ -515,17 +515,6 @@ $(installed_odex) : $(built_odex) | $(ACP)
$(LOCAL_INSTALLED_MODULE) : $(installed_odex) $(LOCAL_INSTALLED_MODULE) : $(installed_odex)
endif endif
# All host modules that are not tagged with optional are automatically installed.
# Save the installed files in ALL_HOST_INSTALLED_FILES.
ifeq ($(LOCAL_IS_HOST_MODULE),true)
ALL_HOST_INSTALLED_FILES += $(LOCAL_INSTALLED_MODULE)
ifneq ($(filter debug eng tests, $(LOCAL_MODULE_TAGS)),)
$(warning $(LOCAL_MODULE_MAKEFILE): Module "$(LOCAL_MODULE)" has useless module tags: $(filter debug eng tests, $(LOCAL_MODULE_TAGS)). It will be installed anyway.)
LOCAL_MODULE_TAGS := $(filter-out debug eng tests, $(LOCAL_MODULE_TAGS))
endif
endif
endif # !LOCAL_UNINSTALLABLE_MODULE endif # !LOCAL_UNINSTALLABLE_MODULE

5
core/definitions.mk
View File

@ -55,11 +55,6 @@ ALL_MODULE_TAGS:=
# its sub-variables.) # its sub-variables.)
ALL_MODULE_NAME_TAGS:= ALL_MODULE_NAME_TAGS:=
# All host modules are automatically installed (i.e. outside
# of the product configuration scheme). This is a list of the
# install targets (LOCAL_INSTALLED_MODULE).
ALL_HOST_INSTALLED_FILES:=
# Full paths to all prebuilt files that will be copied # Full paths to all prebuilt files that will be copied
# (used to make the dependency on acp) # (used to make the dependency on acp)
ALL_PREBUILT:= ALL_PREBUILT:=

3
core/main.mk
View File

@ -655,9 +655,6 @@ ifdef is_sdk_build
$(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_TESTS has nothing to install!))) $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_TESTS has nothing to install!)))
endif endif
# Install all of the host modules
modules_to_install += $(sort $(modules_to_install) $(ALL_HOST_INSTALLED_FILES))
# build/core/Makefile contains extra stuff that we don't want to pollute this # build/core/Makefile contains extra stuff that we don't want to pollute this
# top-level makefile with. It expects that ALL_DEFAULT_INSTALLED_MODULES # top-level makefile with. It expects that ALL_DEFAULT_INSTALLED_MODULES
# contains everything that's built during the current make, but it also further # contains everything that's built during the current make, but it also further