diff options
| author | Ying Wang <wangying@google.com> | 2011-03-07 11:07:12 -0800 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-03-07 11:07:12 -0800 |
| commit | 70d6ec5f9b2b3ae9da0ee28667abf93c5383b991 (patch) | |
| tree | 8b4c5f40b2ebbcea48fd349c5ada6f7c4be7ccd7 /core/Makefile | |
| parent | 71704a690d19de2c5151195c176b65c9fc65390a (diff) | |
| parent | 0a1f3236e319384bec11061a242a9ac44c785278 (diff) | |
| download | build-70d6ec5f9b2b3ae9da0ee28667abf93c5383b991.zip build-70d6ec5f9b2b3ae9da0ee28667abf93c5383b991.tar.gz build-70d6ec5f9b2b3ae9da0ee28667abf93c5383b991.tar.bz2 | |
resolved conflicts for merge of 0a1f3236 to honeycomb-plus-aosp
Change-Id: I6596f4a65a99eed98bdca2d8a6840bc378297b6d
Diffstat (limited to 'core/Makefile')
| -rw-r--r-- | core/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index 1d3110d..523c811 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1085,6 +1085,7 @@ ifneq ($(TARGET_SIMULATOR),true) ifneq ($(TARGET_PRODUCT),sdk) ifeq ($(filter generic%,$(TARGET_DEVICE)),) ifneq ($(TARGET_NO_KERNEL),true) +ifneq ($(recovery_fstab),) # ----------------------------------------------------------------- # OTA update package @@ -1137,6 +1138,7 @@ $(INTERNAL_UPDATE_PACKAGE_TARGET): $(BUILT_TARGET_FILES_PACKAGE) $(OTATOOLS) .PHONY: updatepackage updatepackage: $(INTERNAL_UPDATE_PACKAGE_TARGET) +endif # recovery_fstab is defined endif # TARGET_NO_KERNEL != true endif # TARGET_DEVICE != generic* endif # TARGET_PRODUCT != sdk |