resolved conflicts for merge of a8138028 to lmp-dev-plus-aosp

(cherry picked from commit 4a5a11e416)

Change-Id: Ic5c2297d50f2e59ca5b1eb0c3b81328d23a48253
This commit is contained in:
Brian Carlstrom 2014-07-30 09:53:12 -07:00
parent c6b7676719
commit 56ef86df84
1 changed files with 9 additions and 3 deletions

View File

@ -19,9 +19,10 @@ import sys
# Usage: post_process_props.py file.prop [blacklist_key, ...]
# Blacklisted keys are removed from the property file, if present
# See PROP_VALUE_MAX system_properties.h.
# PROP_VALUE_MAX in system_properties.h includes the termination NUL,
# so we decrease it by 1 here.
# See PROP_NAME_MAX and PROP_VALUE_MAX system_properties.h.
# The constants in system_properties.h includes the termination NUL,
# so we decrease the values by 1 here.
PROP_NAME_MAX = 31
PROP_VALUE_MAX = 91
# Put the modifications that you need to make into the /system/build.prop into this
@ -59,6 +60,11 @@ def validate(prop):
"").startswith("eng")
for key, value in buildprops.iteritems():
# Check build properties' length.
if len(key) > PROP_NAME_MAX:
check_pass = False
sys.stderr.write("error: %s cannot exceed %d bytes: " %
(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