diff options
| author | Elliott Hughes <enh@google.com> | 2012-10-03 12:13:38 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2012-10-03 12:13:38 -0700 |
| commit | 2d17b1aba6ea529dc618d50c784f69fb7f1a8141 (patch) | |
| tree | 7b6e5b3c23d037ba88990e863bf188f9da772e87 /core/product_config.mk | |
| parent | 3ee91251be45830522c6a0aa8d2c145b08b5f327 (diff) | |
| parent | 01b2aaaa89447759d3f80ae8db58098a428fdc3c (diff) | |
| download | build-2d17b1aba6ea529dc618d50c784f69fb7f1a8141.zip build-2d17b1aba6ea529dc618d50c784f69fb7f1a8141.tar.gz build-2d17b1aba6ea529dc618d50c784f69fb7f1a8141.tar.bz2 | |
resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp
Change-Id: I66481eb8b269775716f79e42e9d89c2ebbd45288
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 75df954..e05907d 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -220,7 +220,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)) |