diff options
| author | Elliott Hughes <enh@google.com> | 2012-10-03 12:19:35 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-10-03 12:19:35 -0700 |
| commit | 0b89c64fc49290f833434d42c38c127210f3a0e0 (patch) | |
| tree | fb4a2b50a6e51177cbc6c55fa82cba7dbb22f161 /core/product_config.mk | |
| parent | 71eef22e4ab03c02a2b2574559d14b15c4fd659b (diff) | |
| parent | 2d17b1aba6ea529dc618d50c784f69fb7f1a8141 (diff) | |
| download | build-0b89c64fc49290f833434d42c38c127210f3a0e0.tar.gz build-0b89c64fc49290f833434d42c38c127210f3a0e0.tar.bz2 build-0b89c64fc49290f833434d42c38c127210f3a0e0.zip | |
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
Diffstat (limited to 'core/product_config.mk')
| -rw-r--r-- | core/product_config.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/product_config.mk b/core/product_config.mk index 8826446af..bfbdf7810 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -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)) |