Chromium Code Reviews| Index: build/android/incremental_install/installer.py |
| diff --git a/build/android/incremental_install/installer.py b/build/android/incremental_install/installer.py |
| index 1a58941edd6dece554834ad1fb65bb0248eca9fb..0a5013836b2fe11d4c1bceb6c239a7b0afbefdc4 100755 |
| --- a/build/android/incremental_install/installer.py |
| +++ b/build/android/incremental_install/installer.py |
| @@ -163,12 +163,16 @@ def main(): |
| push_dex_timer.Stop(log=False) |
| def check_sdk_version(): |
|
pkotwicz
2015/10/05 20:02:34
Perhaps rename this to check_selinux() ?
agrieve
2015/10/05 20:08:45
Done.
|
| - if device.build_version_sdk >= version_codes.MARSHMALLOW: |
| - if apk_help.HasIsolatedProcesses(): |
| - raise Exception('Cannot use perform incremental installs on Android M+ ' |
| - 'without first disabling isolated processes.\n' |
| - 'To do so, use GN arg:\n' |
| - ' disable_incremental_isolated_processes=true') |
| + # Samsung started using SELinux before Marshmallow. There may be even more |
| + # cases where this is required... |
| + has_selinux = (device.build_version_sdk >= version_codes.MARSHMALLOW or |
| + device.GetProp('selinux.policy_version')) |
| + if has_selinux and apk_help.HasIsolatedProcesses(): |
| + raise Exception('Cannot use incremental installs on Android devices that ' |
| + 'use using SELinux policies without first disabling ' |
|
pkotwicz
2015/10/05 20:02:34
Nit: Remove 'using'
agrieve
2015/10/05 20:08:45
Done.
|
| + 'isolated processes.\n' |
| + 'To do so, use GN arg:\n' |
| + ' disable_incremental_isolated_processes=true') |
| cache_path = '%s/files-cache.json' % device_incremental_dir |
| def restore_cache(): |