aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2010-03-23 09:52:52 -0700
committerYing Wang <wangying@google.com>2010-03-23 10:34:22 -0700
commit6f1c75849c4b101b55ae624755e43293724ce76e (patch)
treea11c14c66c3ccb8a108d315ffbc053bdeb05c673
parent5d5e67a5da1bbd95bb8eed0ca1d0e9e56775d78b (diff)
downloadbuild-6f1c75849c4b101b55ae624755e43293724ce76e.tar.gz
Don't build ota files for generic device
http://b/issue?id=2535706 Extend from product name generic to device name generic. Generic device does not have files such as kernel which are necessary to build ota files. Remove test of aosp_emulator_us, which is in no use any more. Change-Id: I46025125c152fba79e33092dea817a3be7dc0f91
-rw-r--r--core/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/core/Makefile b/core/Makefile
index 46f53117da..ccc8e80b09 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -906,8 +906,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)
+ifneq ($(TARGET_DEVICE),generic)
name := $(TARGET_PRODUCT)
ifeq ($(TARGET_BUILD_TYPE),debug)
@@ -937,8 +936,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_DEVICE != generic
endif # TARGET_PRODUCT != sdk
endif # TARGET_SIMULATOR != true