merge from open-source master

Change-Id: I9fedeb014c946b53bfdd424b00c0cb5fc08f8333
This commit is contained in:
The Android Open Source Project 2010-03-08 17:16:23 -08:00
commit d2e571cb55

View File

@ -943,6 +943,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)
@ -972,6 +973,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