Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3043)

Unified Diff: build/android/devil/devil_env.py

Issue 1501843002: [Android] Use more specific host platforms for devil. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: better handling of the no adb case Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/devil/devil_dependencies.json ('k') | build/android/devil_chromium.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/android/devil/devil_env.py
diff --git a/build/android/devil/devil_env.py b/build/android/devil/devil_env.py
index fa7392f4f44a355909cb2109a8f8da5342a40d3f..f477b470e892e64406279bba848db41a62352442 100644
--- a/build/android/devil/devil_env.py
+++ b/build/android/devil/devil_env.py
@@ -37,11 +37,11 @@ _DEVIL_DEFAULT_CONFIG = os.path.abspath(os.path.join(
_LEGACY_ENVIRONMENT_VARIABLES = {
'ADB_PATH': {
'dependency_name': 'adb',
- 'platform': 'android_host',
+ 'platform': 'android_linux2',
},
'ANDROID_SDK_ROOT': {
'dependency_name': 'android_sdk',
- 'platform': 'android_host',
+ 'platform': 'android_linux2',
},
}
@@ -120,17 +120,17 @@ class _Environment(object):
self.Initialize()
if dependency in _ANDROID_BUILD_TOOLS:
self.FetchPath('android_build_tools_libc++', arch=arch, device=device)
- return self._dm.FetchPath(dependency, _GetPlatform(arch, device))
+ return self._dm.FetchPath(dependency, GetPlatform(arch, device))
def LocalPath(self, dependency, arch=None, device=None):
if self._dm is None:
self.Initialize()
- return self._dm.LocalPath(dependency, _GetPlatform(arch, device))
+ return self._dm.LocalPath(dependency, GetPlatform(arch, device))
-def _GetPlatform(arch, device):
+def GetPlatform(arch=None, device=None):
if not arch:
- arch = device.product_cpu_abi if device else 'host'
+ arch = device.product_cpu_abi if device else sys.platform
return 'android_%s' % arch
« no previous file with comments | « build/android/devil/devil_dependencies.json ('k') | build/android/devil_chromium.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698