From 910dcbebc07a63debb0848e7cc157664508016ff Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Wed, 24 Mar 2010 23:22:33 -0700 Subject: [PATCH] Cherry-pick 6f1c75849c4b101b55ae624755e43293724ce76e from eclair Change-Id: I21a69669935d838595b2fa01c5be10e6c1975da9 --- core/Makefile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/core/Makefile b/core/Makefile index a89c120ec..fa62c2560 100644 --- a/core/Makefile +++ b/core/Makefile @@ -947,8 +947,7 @@ target-files-package: $(BUILT_TARGET_FILES_PACKAGE) 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 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools .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