diff options
| author | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 01:04:01 +0000 |
|---|---|---|
| committer | tonyg@chromium.org <tonyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-04 01:04:01 +0000 |
| commit | 5bb091be1a5f2b984fc8846f35a8c58191d7bc4e (patch) | |
| tree | 12f0edaf903887c69458c6cc5878c73d637d8d2b /build/android | |
| parent | 0df4943035da98d69ba18ce7e6ed40e6576419cf (diff) | |
| download | chromium_src-5bb091be1a5f2b984fc8846f35a8c58191d7bc4e.zip chromium_src-5bb091be1a5f2b984fc8846f35a8c58191d7bc4e.tar.gz chromium_src-5bb091be1a5f2b984fc8846f35a8c58191d7bc4e.tar.bz2 | |
Make device provisioning check SDK version instead of build string.
BUG=
Review URL: https://codereview.chromium.org/183723002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254624 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/android')
| -rw-r--r-- | build/android/pylib/content_settings.py | 3 | ||||
| -rw-r--r-- | build/android/pylib/device_settings.py | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/build/android/pylib/content_settings.py b/build/android/pylib/content_settings.py index a4cd896..052af75 100644 --- a/build/android/pylib/content_settings.py +++ b/build/android/pylib/content_settings.py @@ -12,7 +12,8 @@ class ContentSettings(dict): def __init__(self, table, adb): super(ContentSettings, self).__init__() - assert adb.GetBuildId()[0] >= 'J', 'ContentSettings supported on >= J' + assert adb.system_properties['ro.build.version.sdk'] >= 16, ( + 'ContentSettings supported only on SDK 16 and later') self._table = table self._adb = adb diff --git a/build/android/pylib/device_settings.py b/build/android/pylib/device_settings.py index 1e53ffc..e7ddab7 100644 --- a/build/android/pylib/device_settings.py +++ b/build/android/pylib/device_settings.py @@ -22,9 +22,8 @@ def ConfigureContentSettingsDict(adb, desired_settings): desired_settings: A dict of {table: {key: value}} for all settings to configure. """ - if adb.GetBuildId()[0] < 'J': - logging.error('Skipping content settings configuration due to ' - 'pre-JellyBean Android version') + if adb.system_properties['ro.build.version.sdk'] < 16: + logging.error('Skipping content settings configuration due to outdated sdk') return for table, key_value in sorted(desired_settings.iteritems()): |