StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

* commit '85f351d1f925b265c401f1992b57dc028d462453':
  Allow devices without AndroidBoard.mk
This commit is contained in:
Jean-Baptiste Queru
2010-09-15 12:56:42 -07:00
committed by Android Git Automerger
parent 6674ec30bb 85f351d1f9
commit 24ab0f58f4
1 changed files with 1 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
target/board/Android.mk
View File

@@ -23,16 +23,7 @@ endif
# Use the add-radio-file function to add values to this variable. # Use the add-radio-file function to add values to this variable.
INSTALLED_RADIOIMAGE_TARGET := INSTALLED_RADIOIMAGE_TARGET :=
ifeq (,$(wildcard $(TARGET_DEVICE_DIR)/AndroidBoard.mk)) -include $(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 # Generate a file that contains various information about the
# device we're building for. This file is typically packaged up # device we're building for. This file is typically packaged up