StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve merge conflicts of 9baa993c07 to nyc-dev

Browse Source 
Change-Id: Ifcfb2da03662ef1b6677c0974605189e2a8e3d20
This commit is contained in:
Tao Bao
2016-03-01 15:08:51 -08:00
parent ed68f54ba0 9baa993c07
commit 8cad831b39
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/releasetools/edify_generator.py
View File

@@ -83,11 +83,17 @@ class EdifyGenerator(object):
raise ValueError("must specify an OEM property")
if not value:
raise ValueError("must specify the OEM value")
cmd = ('file_getprop("/oem/oem.prop", "{name}") == "{value}" || '
'abort("This package expects the value \\"{value}\\" for '
'\\"{name}\\" on the OEM partition; this has value \\"" + '
'file_getprop("/oem/oem.prop", "{name}") + "\\".");').format(
name=name, value=value)
if common.OPTIONS.oem_no_mount:
cmd = ('getprop("{name}") == "{value}" || '
'abort("This package expects the value \\"{value}\\" for '
'\\"{name}\\"; this has value \\"" + '
'getprop("{name}") + "\\".");').format(name=name, value=value)
else:
cmd = ('file_getprop("/oem/oem.prop", "{name}") == "{value}" || '
'abort("This package expects the value \\"{value}\\" for '
'\\"{name}\\" on the OEM partition; this has value \\"" + '
'file_getprop("/oem/oem.prop", "{name}") + "\\".");').format(
name=name, value=value)
self.script.append(cmd)
def AssertSomeFingerprint(self, *fp):