Merge "common: releasetools: Do not distinguish between nand and emmc devices"

This commit is contained in:
Linux Build Service Account 2014-11-05 10:50:00 -08:00 committed by Gerrit - the friendly Code Review server
commit bb73a8f17a
1 changed files with 4 additions and 13 deletions

View File

@ -226,9 +226,8 @@ def IncrementalOTA_Assertions(info):
def IncrementalOTA_VerifyEnd(info):
if info.type == 'MMC':
OTA_VerifyEnd(info, info.target_version, info.target_zip, info.source_zip)
return
OTA_VerifyEnd(info, info.target_version, info.target_zip, info.source_zip)
return
# This function handles only non-HLOS whole partition images
@ -346,13 +345,9 @@ def FullOTA_InstallEnd_MTD(info):
def FullOTA_InstallEnd(info):
if info.type == 'MMC':
FullOTA_InstallEnd_MMC(info)
elif info.type == 'MTD':
FullOTA_InstallEnd_MTD(info)
FullOTA_InstallEnd_MMC(info)
return
def IncrementalOTA_InstallEnd_MMC(info):
OTA_InstallEnd(info)
return
@ -362,10 +357,6 @@ def IncrementalOTA_InstallEnd_MTD(info):
print "warning radio-update: radio update for NAND devices not supported"
return
def IncrementalOTA_InstallEnd(info):
if info.type == 'MMC':
IncrementalOTA_InstallEnd_MMC(info)
elif info.type == 'MTD':
IncrementalOTA_InstallEnd_MTD(info)
IncrementalOTA_InstallEnd_MMC(info)
return