commit 24ab0f58f45fe27ddb48e279c1e0be8105dc8f96
author Jean-Baptiste Queru <jbq@google.com> Wed Sep 15 12:56:42 2010 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 15 12:56:42 2010 -0700
tree 6d6969c4ea969dc7d8f4e33c17c689a454ea953a
parent 6674ec30bb92337e3bccb67bca53555a798a493f
parent 85f351d1f925b265c401f1992b57dc028d462453

am 85f351d1: Merge "Allow devices without AndroidBoard.mk" into gingerbread

Merge commit '85f351d1f925b265c401f1992b57dc028d462453' into gingerbread-plus-aosp

* commit '85f351d1f925b265c401f1992b57dc028d462453':
  Allow devices without AndroidBoard.mk

target/board/Android.mk

diff --git a/target/board/Android.mk b/target/board/Android.mk
index ac8cb44..82dee3c 100644
--- a/target/board/Android.mk
+++ b/target/board/Android.mk
@@ -23,16 +23,7 @@
 # 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