diff options
| author | Joe Onorato <joeo@google.com> | 2012-05-21 12:16:05 -0700 |
|---|---|---|
| committer | Joe Onorato <joeo@google.com> | 2012-08-16 22:36:40 -0700 |
| commit | d23c3235fa183b8c4c78551c5947158d2db8d01f (patch) | |
| tree | 148f80440671cd7fb35164938cb73600aff03100 /core/main.mk | |
| parent | b4da6b50fe683233d7905f06842cc36f5966d980 (diff) | |
| download | build-d23c3235fa183b8c4c78551c5947158d2db8d01f.zip build-d23c3235fa183b8c4c78551c5947158d2db8d01f.tar.gz build-d23c3235fa183b8c4c78551c5947158d2db8d01f.tar.bz2 | |
Dump the user tagged modules.
Change-Id: I623821df3e48b358a6b898ccb13750f7dc54ddcf
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 24 |
1 files changed, 23 insertions, 1 deletions
diff --git a/core/main.mk b/core/main.mk index 7e7244e..7598d86 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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)) |