diff options
author | Ying Wang <wangying@google.com> | 2015-02-05 02:36:41 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-05 02:36:41 +0000 |
commit | 18202932d10f6467950be5ed2c5d7a2e80214925 (patch) | |
tree | 571fdbb46f3837ee393ddd96fd07c046e29ba6d2 | |
parent | 3e9b20e4309edb0162d120aecf6a4021c8d1b2d6 (diff) | |
parent | f4bd044f09529430bdc9ac3cba083a39867dfab4 (diff) | |
download | build-18202932d10f6467950be5ed2c5d7a2e80214925.zip build-18202932d10f6467950be5ed2c5d7a2e80214925.tar.gz build-18202932d10f6467950be5ed2c5d7a2e80214925.tar.bz2 |
am f4bd044f: am d51b0fd3: Merge "Fail even dev build when property value exceeds length limit."
* commit 'f4bd044f09529430bdc9ac3cba083a39867dfab4':
Fail even dev build when property value exceeds length limit.
-rwxr-xr-x | tools/post_process_props.py | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/tools/post_process_props.py b/tools/post_process_props.py index 030826d..fa6106f 100755 --- a/tools/post_process_props.py +++ b/tools/post_process_props.py @@ -56,8 +56,6 @@ def validate(prop): """ check_pass = True buildprops = prop.to_dict() - dev_build = buildprops.get("ro.build.version.incremental", - "").startswith("eng") for key, value in buildprops.iteritems(): # Check build properties' length. if len(key) > PROP_NAME_MAX: @@ -66,19 +64,10 @@ def validate(prop): (key, PROP_NAME_MAX)) sys.stderr.write("%s (%d)\n" % (key, len(key))) if len(value) > PROP_VALUE_MAX: - # If dev build, show a warning message, otherwise fail the - # build with error message - if dev_build: - sys.stderr.write("warning: %s exceeds %d bytes: " % - (key, PROP_VALUE_MAX)) - sys.stderr.write("%s (%d)\n" % (value, len(value))) - sys.stderr.write("warning: This will cause the %s " % key) - sys.stderr.write("property return as empty at runtime\n") - else: - check_pass = False - sys.stderr.write("error: %s cannot exceed %d bytes: " % - (key, PROP_VALUE_MAX)) - sys.stderr.write("%s (%d)\n" % (value, len(value))) + check_pass = False + sys.stderr.write("error: %s cannot exceed %d bytes: " % + (key, PROP_VALUE_MAX)) + sys.stderr.write("%s (%d)\n" % (value, len(value))) return check_pass class PropFile: |