Merge "Allow devices without AndroidBoard.mk" into gingerbread

This commit is contained in:
Jean-Baptiste Queru
2010-09-15 12:54:56 -07:00
committed by Android (Google) Code Review

View File

@@ -23,16 +23,7 @@ endif
# Use the add-radio-file function to add values to this variable.
INSTALLED_RADIOIMAGE_TARGET :=
ifeq (,$(wildcard $(TARGET_DEVICE_DIR)/AndroidBoard.mk))
ifeq (,$(wildcard $(TARGET_DEVICE_DIR)/Android.mk))
$(error Missing "$(TARGET_DEVICE_DIR)/AndroidBoard.mk")
else
# TODO: Remove this check after people have had a chance to switch,
# after April 2009.
$(error Please rename "$(TARGET_DEVICE_DIR)/Android.mk" to "$(TARGET_DEVICE_DIR)/AndroidBoard.mk")
endif
endif
include $(TARGET_DEVICE_DIR)/AndroidBoard.mk
-include $(TARGET_DEVICE_DIR)/AndroidBoard.mk
# Generate a file that contains various information about the
# device we're building for. This file is typically packaged up