aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Pasanen <dan.pasanen@gmail.com>2017-01-29 15:16:39 (GMT)
committerTom Powell <zifnab@zifnab06.net>2017-03-14 19:59:32 (GMT)
commit28032f6bb6728fc26bf1258cb939fbaf12ec0e7e (patch)
treeb06b7ec4eb0d5549d14286c72e1ab710c9b71857
parentd665640480e762ada4b8cd778eb76d4270995907 (diff)
downloadandroid_build-cm-14.1_old.zip
android_build-cm-14.1_old.tar.gz
android_build-cm-14.1_old.tar.bz2
Revert "ota: Remove cruft we don't care about"cm-14.1_oldrefs/changes/73/159073/2
* We really should prevent users from "downgrading" builds This reverts commit 0a09be83aec05d716e54fcf28dd2881be6006826. Change-Id: Id703a71ca1f1b571d8e4285152717ac07d01d904
-rwxr-xr-xtools/releasetools/ota_from_target_files.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index fb5a354..e926c2b 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -601,10 +601,10 @@ def WriteFullOTAPackage(input_zip, output_zip):
metadata["ota-type"] = "BLOCK" if block_based else "FILE"
- #if not OPTIONS.omit_prereq:
- # ts = GetBuildProp("ro.build.date.utc", OPTIONS.info_dict)
- # ts_text = GetBuildProp("ro.build.date", OPTIONS.info_dict)
- # script.AssertOlderBuild(ts, ts_text)
+ if not OPTIONS.omit_prereq:
+ ts = GetBuildProp("ro.build.date.utc", OPTIONS.info_dict)
+ ts_text = GetBuildProp("ro.build.date", OPTIONS.info_dict)
+ script.AssertOlderBuild(ts, ts_text)
AppendAssertions(script, OPTIONS.info_dict, oem_dict)
device_specific.FullOTA_Assertions()