resolved conflicts for merge of a8138028
to lmp-dev-plus-aosp
Change-Id: I5573d097d741f4922b791b33de5c941af08127c6
This commit is contained in:
@@ -19,9 +19,10 @@ import sys
|
|||||||
# Usage: post_process_props.py file.prop [blacklist_key, ...]
|
# Usage: post_process_props.py file.prop [blacklist_key, ...]
|
||||||
# Blacklisted keys are removed from the property file, if present
|
# Blacklisted keys are removed from the property file, if present
|
||||||
|
|
||||||
# See PROP_VALUE_MAX system_properties.h.
|
# See PROP_NAME_MAX and PROP_VALUE_MAX system_properties.h.
|
||||||
# PROP_VALUE_MAX in system_properties.h includes the termination NUL,
|
# The constants in system_properties.h includes the termination NUL,
|
||||||
# so we decrease it by 1 here.
|
# so we decrease the values by 1 here.
|
||||||
|
PROP_NAME_MAX = 31
|
||||||
PROP_VALUE_MAX = 91
|
PROP_VALUE_MAX = 91
|
||||||
|
|
||||||
# Put the modifications that you need to make into the /system/build.prop into this
|
# Put the modifications that you need to make into the /system/build.prop into this
|
||||||
@@ -59,6 +60,11 @@ def validate(prop):
|
|||||||
"").startswith("eng")
|
"").startswith("eng")
|
||||||
for key, value in buildprops.iteritems():
|
for key, value in buildprops.iteritems():
|
||||||
# Check build properties' length.
|
# 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 len(value) > PROP_VALUE_MAX:
|
||||||
# If dev build, show a warning message, otherwise fail the
|
# If dev build, show a warning message, otherwise fail the
|
||||||
# build with error message
|
# build with error message
|
||||||
|
Reference in New Issue
Block a user