commit 910dcbebc07a63debb0848e7cc157664508016ff
author Ying Wang <wangying@google.com> Wed Mar 24 23:22:33 2010 -0700
committer Ying Wang <wangying@google.com> Wed Mar 24 23:22:33 2010 -0700
tree 6859d4f1d13c94d4a2946a941a5eb8467ac27ef1
parent 84f8a5e2ef068e5c293d547803621c6a8fa29627

Cherry-pick 6f1c75849c4b101b55ae624755e43293724ce76e from eclair

Change-Id: I21a69669935d838595b2fa01c5be10e6c1975da9

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index a89c120..fa62c25 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -947,8 +947,7 @@
 
 ifneq ($(TARGET_SIMULATOR),true)
 ifneq ($(TARGET_PRODUCT),sdk)
-ifneq ($(TARGET_PRODUCT),generic)
-ifneq ($(TARGET_PRODUCT),aosp_emulator_us)
+ifneq ($(TARGET_DEVICE),generic)
 
 name := $(TARGET_PRODUCT)
 ifeq ($(TARGET_BUILD_TYPE),debug)
@@ -978,8 +977,7 @@
 .PHONY: otapackage
 otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)
 
-endif    # TARGET_PRODUCT != aosp_emulator_us
-endif    # TARGET_PRODUCT != generic
+endif    # TARGET_DEVICE != generic
 endif    # TARGET_PRODUCT != sdk
 endif    # TARGET_SIMULATOR != true