diff options
| author | Joe Onorato <joeo@google.com> | 2012-07-11 19:38:48 -0700 |
|---|---|---|
| committer | Joe Onorato <joeo@google.com> | 2012-08-16 22:36:41 -0700 |
| commit | 26ead966d72a436beddf02ef17268071cb982ce0 (patch) | |
| tree | ec940094f4d29d8ea1eb9a9cfa07064b533d7490 /core/main.mk | |
| parent | 75493610b33323ccc958e2ff45e9eafb9750fa5d (diff) | |
| download | build-26ead966d72a436beddf02ef17268071cb982ce0.zip build-26ead966d72a436beddf02ef17268071cb982ce0.tar.gz build-26ead966d72a436beddf02ef17268071cb982ce0.tar.bz2 | |
build system changes for jb-aah-dev merge
Change-Id: I29e27505a0d9f7cc2932f725bfe1c83d804388bc
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/core/main.mk b/core/main.mk index f76a8d1..874bb0b 100644 --- a/core/main.mk +++ b/core/main.mk @@ -597,11 +597,12 @@ ifdef FULL_BUILD # The base list of modules to build for this product is specified # by the appropriate product definition file, which was included # by product_config.make. - product_MODULES := $(call module-installed-files, \ - $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES)) + product_MODULES := $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES) + $(call expand-required-modules,product_MODULES,$(product_MODULES)) + product_FILES := $(call module-installed-files, $(product_MODULES)) ifeq (0,1) - $(info product_MODULES for $(TARGET_DEVICE) ($(INTERNAL_PRODUCT)):) - $(foreach p,$(product_MODULES),$(info : $(p))) + $(info product_FILES for $(TARGET_DEVICE) ($(INTERNAL_PRODUCT)):) + $(foreach p,$(product_FILES),$(info : $(p))) $(error done) endif else @@ -609,7 +610,7 @@ else # a subset of the module makefiles. Don't try to build any modules # requested by the product, because we probably won't have rules # to build them. - product_MODULES := + product_FILES := endif # When modules are tagged with debug eng or tests, they are installed @@ -623,7 +624,7 @@ tests_MODULES := $(sort $(call get-tagged-modules,tests)) # TODO: The shell is chosen by magic. Do we still need this? modules_to_install := $(sort \ $(ALL_DEFAULT_INSTALLED_MODULES) \ - $(product_MODULES) \ + $(product_FILES) \ $(foreach tag,$(tags_to_install),$($(tag)_MODULES)) \ $(call get-tagged-modules, shell_$(TARGET_SHELL)) \ $(CUSTOM_MODULES) \ |