am f3b86591: Merge "Allow full_x86 and full_mips in unbundled build." into jb-mr1-dev

* commit 'f3b86591055b50c327857aae45cb358bcb7512c4':
  Allow full_x86 and full_mips in unbundled build.
This commit is contained in:
Ying Wang 2012-08-22 10:12:15 -07:00 committed by Android Git Automerger
commit 92809fe886

View file

@ -25,12 +25,12 @@
# it includes.
#
# Unbundled apps will be built with the default product config.
# Unbundled apps will be built with the most generic product config.
ifneq ($(TARGET_BUILD_APPS),)
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/core.mk \
$(LOCAL_DIR)/generic.mk \
$(LOCAL_DIR)/full.mk
$(LOCAL_DIR)/full.mk \
$(LOCAL_DIR)/full_x86.mk \
$(LOCAL_DIR)/full_mips.mk
else
PRODUCT_MAKEFILES := \
$(LOCAL_DIR)/core.mk \