Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5085447f authored by Ying Wang's avatar Ying Wang Committed by Gerrit Code Review
Browse files

Merge "Don't install all host modules by default."

parents 08d56b4a 2e65cd55

core/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -1454,7 +1454,6 @@ deps := \ 
	$(atree_dir)/sdk.atree \

	$(sdk_tools_atree_files) \

	$(HOST_OUT_EXECUTABLES)/atree \

	$(ALL_HOST_INSTALLED_FILES) \

	$(HOST_OUT_EXECUTABLES)/line_endings



INTERNAL_SDK_TARGET := $(sdk_dir)/$(sdk_name).zip

core/base_rules.mk

+0 −11
Original line number Diff line number Diff line
@@ -515,17 +515,6 @@ $(installed_odex) : $(built_odex) | $(ACP) 


$(LOCAL_INSTALLED_MODULE) : $(installed_odex)

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

core/definitions.mk

+0 −5
Original line number Diff line number Diff line
@@ -55,11 +55,6 @@ ALL_MODULE_TAGS:= 
# its sub-variables.)

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

# (used to make the dependency on acp)

ALL_PREBUILT:=

core/main.mk

+0 −3
Original line number Diff line number Diff line
@@ -655,9 +655,6 @@ ifdef is_sdk_build 
      $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_TESTS has nothing to install!)))

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

# top-level makefile with.  It expects that ALL_DEFAULT_INSTALLED_MODULES

# contains everything that's built during the current make, but it also further