diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:43:57 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-02-10 15:43:57 -0800 |
| commit | 475fa12adef8fc2b08290555a33dc8a9fef05be4 (patch) | |
| tree | 58df3e2bd95b7be3e2bddfa8bf2c95ea8a4fa613 /target/board | |
| parent | 35cfb08c588ba0af98ad0845ced6a9eeeeca4054 (diff) | |
| download | build-475fa12adef8fc2b08290555a33dc8a9fef05be4.zip build-475fa12adef8fc2b08290555a33dc8a9fef05be4.tar.gz build-475fa12adef8fc2b08290555a33dc8a9fef05be4.tar.bz2 | |
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'target/board')
| -rw-r--r-- | target/board/Android.mk | 11 | ||||
| -rw-r--r-- | target/board/emulator/AndroidBoard.mk (renamed from target/board/emulator/Android.mk) | 0 | ||||
| -rw-r--r-- | target/board/generic/AndroidBoard.mk (renamed from target/board/generic/Android.mk) | 0 | ||||
| -rw-r--r-- | target/board/sim/AndroidBoard.mk (renamed from target/board/sim/Android.mk) | 0 |
4 files changed, 10 insertions, 1 deletions
diff --git a/target/board/Android.mk b/target/board/Android.mk index 4d34969..64e3a74 100644 --- a/target/board/Android.mk +++ b/target/board/Android.mk @@ -26,7 +26,16 @@ else INSTALLED_RADIOIMAGE_TARGET := endif -include $(TARGET_DEVICE_DIR)/Android.mk +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 # Generate a file that contains various information about the # device we're building for. This file is typically packaged up diff --git a/target/board/emulator/Android.mk b/target/board/emulator/AndroidBoard.mk index 09badee..09badee 100644 --- a/target/board/emulator/Android.mk +++ b/target/board/emulator/AndroidBoard.mk diff --git a/target/board/generic/Android.mk b/target/board/generic/AndroidBoard.mk index 09badee..09badee 100644 --- a/target/board/generic/Android.mk +++ b/target/board/generic/AndroidBoard.mk diff --git a/target/board/sim/Android.mk b/target/board/sim/AndroidBoard.mk index e69de29..e69de29 100644 --- a/target/board/sim/Android.mk +++ b/target/board/sim/AndroidBoard.mk |