diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-15 17:53:46 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-15 17:53:46 -0700 |
| commit | 1eeec7cb415c3936cafba6f7099df09813103363 (patch) | |
| tree | f4c2bb498312a0129f0215b7ed64d210fc308097 /target | |
| parent | 0153446b798f2ead1b6a9a9a704374fbbcc66ba0 (diff) | |
| parent | 24ab0f58f45fe27ddb48e279c1e0be8105dc8f96 (diff) | |
| download | build-1eeec7cb415c3936cafba6f7099df09813103363.zip build-1eeec7cb415c3936cafba6f7099df09813103363.tar.gz build-1eeec7cb415c3936cafba6f7099df09813103363.tar.bz2 | |
am 24ab0f58: am 85f351d1: Merge "Allow devices without AndroidBoard.mk" into gingerbread
Merge commit '24ab0f58f45fe27ddb48e279c1e0be8105dc8f96'
* commit '24ab0f58f45fe27ddb48e279c1e0be8105dc8f96':
Allow devices without AndroidBoard.mk
Diffstat (limited to 'target')
| -rw-r--r-- | target/board/Android.mk | 11 |
1 files changed, 1 insertions, 10 deletions
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 @@ 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 |