commit 93521c42e4e91136b3506ce4f472411dc420a29a
author The Android Open Source Project <initial-contribution@android.com> Mon Jun 15 19:29:10 2009 -0700
committer The Android Open Source Project <initial-contribution@android.com> Mon Jun 15 19:29:10 2009 -0700
tree 856b86aca1a1a7df4164f69da427770dd94dabe3
parent 61ceba259d738e04fb1701a1ef79d08040492a32
parent 367910fc6dd41e1d84789b305e6bd9cbafb78fbc

manual merge of 367910fc, don't build ota or update packages for sdk or sim

Merge commit '367910fc'

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 5ec4532..7f4299e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -861,6 +861,10 @@
 
 # -----------------------------------------------------------------
 # OTA update package
+
+ifneq ($(TARGET_SIMULATOR),true)
+ifneq ($(TARGET_PRODUCT),sdk)
+
 name := $(TARGET_PRODUCT)
 ifeq ($(TARGET_BUILD_TYPE),debug)
   name := $(name)_debug
@@ -881,6 +885,8 @@
 .PHONY: otapackage
 otapackage: $(INTERNAL_OTA_PACKAGE_TARGET)
 
+endif    # TARGET_PRODUCT != sdk
+endif    # TARGET_SIMULATOR != true
 
 # -----------------------------------------------------------------
 # installed file list
@@ -983,6 +989,9 @@
 # -----------------------------------------------------------------
 # The update package
 
+ifneq ($(TARGET_SIMULATOR),true)
+ifneq ($(TARGET_PRODUCT),sdk)
+
 name := $(TARGET_PRODUCT)
 ifeq ($(TARGET_BUILD_TYPE),debug)
   name := $(name)_debug
@@ -1000,6 +1009,9 @@
 .PHONY: updatepackage
 updatepackage: $(INTERNAL_UPDATE_PACKAGE_TARGET)
 
+endif    # TARGET_PRODUCT != sdk
+endif    # TARGET_SIMULATOR != true
+
 # -----------------------------------------------------------------
 # The emulator package