| Index: native_client_sdk/src/build_tools/build_utils.py
|
| diff --git a/native_client_sdk/src/build_tools/build_utils.py b/native_client_sdk/src/build_tools/build_utils.py
|
| index 83df0300578bf7ef0ec328f880d070c7d5dd7c1f..ffe8cf0d38800eef260a442c4de590a93f59371c 100644
|
| --- a/native_client_sdk/src/build_tools/build_utils.py
|
| +++ b/native_client_sdk/src/build_tools/build_utils.py
|
| @@ -31,8 +31,18 @@ def ChromeVersion():
|
| if info.url.startswith('/trunk/'):
|
| return 'trunk.%s' % info.revision
|
| else:
|
| - exec(open(VERSION_PATH).read())
|
| - return '%s.%s.%s.%s' % (MAJOR, MINOR, BUILD, PATCH)
|
| + return ChromeVersionNoTrunk()
|
| +
|
| +
|
| +def ChromeVersionNoTrunk():
|
| + '''Extract the chrome version from src/chrome/VERSION.
|
| + Ignore whether this is a trunk build.
|
| +
|
| + Returns:
|
| + Chrome version string.
|
| + '''
|
| + exec(open(VERSION_PATH).read())
|
| + return '%s.%s.%s.%s' % (MAJOR, MINOR, BUILD, PATCH)
|
|
|
|
|
| def ChromeMajorVersion():
|
|
|