Merge from eclair

Change-Id: I4496dadd8a738a05c647589ca78732e9b608ca29
This commit is contained in:
Jean-Baptiste Queru
2010-03-05 07:23:14 -08:00

View File

@@ -907,6 +907,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)
name := $(TARGET_PRODUCT)
ifeq ($(TARGET_BUILD_TYPE),debug)
@@ -936,6 +937,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_PRODUCT != sdk
endif # TARGET_SIMULATOR != true