Index: build/android/pylib/base/environment_factory.py |
diff --git a/build/android/pylib/base/environment_factory.py b/build/android/pylib/base/environment_factory.py |
index c96d19920f7802c5e1a5d8cff9ae6ecb941457dd..5d940a86caadbff55c39fae61e611ac111692102 100644 |
--- a/build/android/pylib/base/environment_factory.py |
+++ b/build/android/pylib/base/environment_factory.py |
@@ -2,10 +2,16 @@ |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
+from pylib import constants |
+from pylib.local.device import local_device_environment |
-def CreateEnvironment(_args, error_func): |
- # TODO(jbudorick) Add local device environment. |
- # TODO(jbudorick) Add local machine environment. |
- error_func('No environments currently supported.') |
+def CreateEnvironment(args, error_func): |
+ |
+ if args.environment == 'local': |
+ if args.command not in constants.LOCAL_MACHINE_TESTS: |
+ return local_device_environment.LocalDeviceEnvironment(args, error_func) |
+ # TODO(jbudorick) Add local machine environment. |
+ |
+ error_func('Unable to create %s environment.' % args.environment) |