commit 4ac823834c2156d04713a3be11529a06a93ac12f
author Linux Build Service Account <lnxbuild@localhost> Fri Aug 03 10:23:40 2012 -0700
committer QuIC Gerrit Code Review <code-review@localhost> Fri Aug 03 10:23:40 2012 -0700
tree 07c5aac2a42a12c8a930ae4e83287f10384ed646
parent 719824ec06dcc3e26fc6e98d32504290fdab07e4
parent 26b9d1bd6fa163b5e5e35f990f2c70b070cc0259

Merge "build: standardize usage of TARGET_PRODUCT for qcom chipsets."

AndroidBoot.mk

diff --git a/AndroidBoot.mk b/AndroidBoot.mk
index bcf1c6f..b51344f 100644
--- a/AndroidBoot.mk
+++ b/AndroidBoot.mk
@@ -10,9 +10,12 @@
 ifneq ($(strip $(TARGET_BOOTLOADER_PLATFORM_OVERRIDE)),)
   BOOTLOADER_PLATFORM := $(TARGET_BOOTLOADER_PLATFORM_OVERRIDE)
 else
-  BOOTLOADER_PLATFORM := $(TARGET_PRODUCT)
+  ifeq ($(call is-board-platform,msm8660),true)
+    BOOTLOADER_PLATFORM := msm8660_surf
+  else
+    BOOTLOADER_PLATFORM := $(TARGET_BOARD_PLATFORM)
+  endif
 endif
-
 # NAND variant output
 TARGET_NAND_BOOTLOADER := $(PRODUCT_OUT)/appsboot.mbn
 NAND_BOOTLOADER_OUT := $(TARGET_OUT_INTERMEDIATES)/NAND_BOOTLOADER_OBJ