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

Commit d23c3235 authored by Joe Onorato's avatar Joe Onorato
Browse files

Dump the user tagged modules. 

Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
parent b4da6b50

core/main.mk

+23 −1
Original line number Diff line number Diff line
@@ -616,6 +616,18 @@ endif 
# Use tags to get the non-APPS user modules.  Use the product

# definition files to get the APPS user modules.

user_MODULES := $(sort $(call get-tagged-modules,user shell_$(TARGET_SHELL)))



# Print the user modules that are not in ...PRODUCT_PACKAGES

ifeq (1,1)

  $(warning Writing modules list: modules/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT).txt)

  $(shell rm -f modules/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT).txt)

  $(foreach m, \

      $(filter-out $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \

          $(call module-names-for-tag-list, user)), \

      $(shell echo $m >> modules/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT).txt))

endif





user_MODULES := $(user_MODULES) $(user_PACKAGES)



eng_MODULES := $(sort $(call get-tagged-modules,eng))
@@ -657,7 +669,7 @@ ifdef is_sdk_build 
  # Ensure every module listed in PRODUCT_PACKAGES gets something installed

  $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \

      $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\

          $(error Module '$(m)' in PRODUCT_PACKAGES has nothing to install!)))

          $(error $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES has nothing to install!)))

endif



# Install all of the host modules
@@ -674,6 +686,16 @@ ALL_DEFAULT_INSTALLED_MODULES := 


endif # dont_bother



# Print the modules that we think we will install

ifeq (1,1)

  $(warning Writing installed file list: installed/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT).txt)

  $(shell rm -f installed/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT).txt)

  $(foreach m, $(modules_to_install), \

      $(shell echo $m >> installed/$(TARGET_PRODUCT)-$(TARGET_BUILD_VARIANT).txt))

  $(error stop)

endif





# These are additional goals that we build, in order to make sure that there

# is as little code as possible in the tree that doesn't build.

modules_to_check := $(foreach m,$(ALL_MODULES),$(ALL_MODULES.$(m).CHECKED))

core/product_config.mk

+6 −0
Original line number Diff line number Diff line
@@ -199,6 +199,12 @@ $(dump-products) 
$(error done)

endif



ifeq (a,b)

$(info PRODUCTS -----------)

$(foreach product, $(PRODUCTS), $(info $(PRODUCTS.$(product).PRODUCT_NAME)))# $(product)))

$(error stop)

endif



# Convert a short name like "sooner" into the path to the product

# file defining that product.

#