p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Change-Id: I66481eb8b269775716f79e42e9d89c2ebbd45288
This commit is contained in:
Elliott Hughes 2012-10-03 12:13:38 -07:00
parent 3ee91251be 01b2aaaa89
commit 2d17b1aba6
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/main.mk
View File

@ -738,7 +738,6 @@ $(ALL_C_CPP_ETC_OBJECTS): | all_copied_headers
.PHONY: files .PHONY: files
files: prebuilt \ files: prebuilt \
$(modules_to_install) \ $(modules_to_install) \
$(modules_to_check) \
$(INSTALLED_ANDROID_INFO_TXT_TARGET) $(INSTALLED_ANDROID_INFO_TXT_TARGET)
# ------------------------------------------------------------------- # -------------------------------------------------------------------

2
core/product_config.mk
View File

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