diff options
| author | Joe Onorato <joeo@google.com> | 2012-08-17 01:26:41 -0700 |
|---|---|---|
| committer | Joe Onorato <joeo@google.com> | 2012-08-17 01:26:41 -0700 |
| commit | c5fbef5413fea32b0084fd197bd27f9effcb2760 (patch) | |
| tree | 1bc6a17ba2653c4f1a331f22ce91b0e306ed6ad4 /core/main.mk | |
| parent | 5956db9394a3d82bfe1b54bd0264624bd00095ee (diff) | |
| parent | fab83a3d62b8652ccdb5ddadc8a6a3f3bf0edf20 (diff) | |
| download | build-c5fbef5413fea32b0084fd197bd27f9effcb2760.zip build-c5fbef5413fea32b0084fd197bd27f9effcb2760.tar.gz build-c5fbef5413fea32b0084fd197bd27f9effcb2760.tar.bz2 | |
resolved conflicts for merge of fab83a3d to jb-mr1-dev
Change-Id: I97aff2be317fd10b68d933e65259ec48bd5ff6a1
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/main.mk b/core/main.mk index 6b766fb..def9f62 100644 --- a/core/main.mk +++ b/core/main.mk @@ -669,16 +669,16 @@ ifdef is_sdk_build # TODO: Should we do this for all builds and not just the sdk? $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES), \ $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\ - $(error $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES has nothing to install!))) + $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES has nothing to install!))) $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_DEBUG), \ $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\ - $(error $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_DEBUG has nothing to install!))) + $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_DEBUG has nothing to install!))) $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_ENG), \ $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\ - $(error $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_ENG has nothing to install!))) + $(warning $(ALL_MODULES.$(m).MAKEFILE): Module '$(m)' in PRODUCT_PACKAGES_ENG has nothing to install!))) $(foreach m, $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PACKAGES_TESTS), \ $(if $(strip $(ALL_MODULES.$(m).INSTALLED)),,\ - $(error $(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 # Install all of the host modules |