commit 35cfb08c588ba0af98ad0845ced6a9eeeeca4054
author The Android Open Source Project <initial-contribution@android.com> Thu Jan 22 00:13:40 2009 -0800
committer The Android Open Source Project <initial-contribution@android.com> Thu Jan 22 00:13:40 2009 -0800
tree cae84026e2b4e0b925ffdcd7844ce90376e1c19d
parent ed18741e07c5e344ff3375a293100ffb29f19b51

auto import from //branches/cupcake/...@127436

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 4f97b33..216225b 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -361,22 +361,8 @@
 TARGET_DEVICE_DIR := $(patsubst %/,%,$(dir $(board_config_mk)))
 board_config_mk :=
 
-ifdef CUSTOM_PKG
-$(info ***************************************************************)
-$(info ***************************************************************)
-$(info CUSTOM_PKG is obsolete; use CUSTOM_MODULES)
-$(info ***************************************************************)
-$(info ***************************************************************)
-$(error stopping)
-endif
-ifdef CUSTOM_TARGETS
-$(info ***************************************************************)
-$(info ***************************************************************)
-$(info CUSTOM_TARGETS is obsolete; use CUSTOM_MODULES)
-$(info ***************************************************************)
-$(info ***************************************************************)
-$(error stopping)
-endif
+# Clean up/verify variables defined by the board config file.
+TARGET_BOOTLOADER_BOARD_NAME := $(strip $(TARGET_BOOTLOADER_BOARD_NAME))
 
 #
 # Include all of the makefiles in the system