commit 2d17b1aba6ea529dc618d50c784f69fb7f1a8141
author Elliott Hughes <enh@google.com> Wed Oct 03 12:13:38 2012 -0700
committer Elliott Hughes <enh@google.com> Wed Oct 03 12:13:38 2012 -0700
tree 7b6e5b3c23d037ba88990e863bf188f9da772e87
parent 3ee91251be45830522c6a0aa8d2c145b08b5f327
parent 01b2aaaa89447759d3f80ae8db58098a428fdc3c

resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp

Change-Id: I66481eb8b269775716f79e42e9d89c2ebbd45288

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 87488f4..ffc1501 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -738,7 +738,6 @@
 .PHONY: files
 files: prebuilt \
         $(modules_to_install) \
-        $(modules_to_check) \
         $(INSTALLED_ANDROID_INFO_TXT_TARGET)
 
 # -------------------------------------------------------------------

core/product_config.mk

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 @@
 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))