am 2d17b1ab: resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp

* commit '2d17b1aba6ea529dc618d50c784f69fb7f1a8141':
  Build only modules required by the current product.
  Load only the current product config makefile.
  Run clean steps in only given paths when using mm/mmm
This commit is contained in:
Elliott Hughes 2012-10-03 12:19:35 -07:00 committed by Android Git Automerger
commit 0b89c64fc4
1 changed files with 1 additions and 1 deletions

View File

@ -219,7 +219,7 @@ $(call import-products, $(all_product_makefiles))
else
# Import just the current product.
ifndef current_product_makefile
$(error Cannot locate config makefile for product "$(TARGET_PRODUCT)")
$(error Can not locate config makefile for product "$(TARGET_PRODUCT)")
endif
ifneq (1,$(words $(current_product_makefile)))
$(error Product "$(TARGET_PRODUCT)" ambiguous: matches $(current_product_makefile))