Cherry-pick 6f1c75849c4b101b55ae624755e43293724ce76e from eclair

Change-Id: I21a69669935d838595b2fa01c5be10e6c1975da9
This commit is contained in:
Ying Wang 2010-03-24 23:22:33 -07:00
parent 84f8a5e2ef
commit 910dcbebc0
1 changed files with 2 additions and 4 deletions

View File

@ -947,8 +947,7 @@ target-files-package: $(BUILT_TARGET_FILES_PACKAGE)
ifneq ($(TARGET_SIMULATOR),true) ifneq ($(TARGET_SIMULATOR),true)
ifneq ($(TARGET_PRODUCT),sdk) ifneq ($(TARGET_PRODUCT),sdk)
ifneq ($(TARGET_PRODUCT),generic) ifneq ($(TARGET_DEVICE),generic)
ifneq ($(TARGET_PRODUCT),aosp_emulator_us)
name := $(TARGET_PRODUCT) name := $(TARGET_PRODUCT)
ifeq ($(TARGET_BUILD_TYPE),debug) ifeq ($(TARGET_BUILD_TYPE),debug)
@ -978,8 +977,7 @@ $(INTERNAL_OTA_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) otatools
.PHONY: otapackage .PHONY: otapackage
otapackage: $(INTERNAL_OTA_PACKAGE_TARGET) otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)
endif # TARGET_PRODUCT != aosp_emulator_us endif # TARGET_DEVICE != generic
endif # TARGET_PRODUCT != generic
endif # TARGET_PRODUCT != sdk endif # TARGET_PRODUCT != sdk
endif # TARGET_SIMULATOR != true endif # TARGET_SIMULATOR != true