commit d2e571cb5565356223718b82e835f56aff0c78c8
author The Android Open Source Project <initial-contribution@android.com> Mon Mar 08 17:16:23 2010 -0800
committer The Android Open Source Project <initial-contribution@android.com> Mon Mar 08 17:16:23 2010 -0800
tree f2a9ca34e2b784500f4fee9e19c25592a782dd19
parent 99e087bc82c11d5909785acc7333176952a14032
parent 048683ea7e2d21dc681917d1b0eab7a24df79eaf

merge from open-source master

Change-Id: I9fedeb014c946b53bfdd424b00c0cb5fc08f8333

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 1ae7460..a59159d 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -943,6 +943,7 @@
 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 @@
 .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