Commit b2348f42 authored by machenbach's avatar machenbach Committed by Commit bot

[android] Remove legacy architecture configs from perf runner.

The android_* configs were never real v8 target
architectures, only make targets. This doesn't make sense
with ninja anymore.

BUG=chromium:502176
LOG=n
NOTRY=true

Review URL: https://codereview.chromium.org/1220743002

Cr-Commit-Position: refs/heads/master@{#29349}
parent 741fc2ce
...@@ -108,11 +108,7 @@ from testrunner.local import commands ...@@ -108,11 +108,7 @@ from testrunner.local import commands
from testrunner.local import utils from testrunner.local import utils
ARCH_GUESS = utils.DefaultArch() ARCH_GUESS = utils.DefaultArch()
SUPPORTED_ARCHS = ["android_arm", SUPPORTED_ARCHS = ["arm",
"android_arm64",
"android_ia32",
"android_x64",
"arm",
"ia32", "ia32",
"mips", "mips",
"mipsel", "mipsel",
...@@ -470,7 +466,7 @@ class Platform(object): ...@@ -470,7 +466,7 @@ class Platform(object):
@staticmethod @staticmethod
def GetPlatform(options): def GetPlatform(options):
if options.arch.startswith("android"): if options.android_build_tools:
return AndroidPlatform(options) return AndroidPlatform(options)
else: else:
return DesktopPlatform(options) return DesktopPlatform(options)
...@@ -632,7 +628,8 @@ def Main(args): ...@@ -632,7 +628,8 @@ def Main(args):
logging.getLogger().setLevel(logging.INFO) logging.getLogger().setLevel(logging.INFO)
parser = optparse.OptionParser() parser = optparse.OptionParser()
parser.add_option("--android-build-tools", parser.add_option("--android-build-tools",
help="Path to chromium's build/android.") help="Path to chromium's build/android. Specifying this "
"option will run tests using android platform.")
parser.add_option("--arch", parser.add_option("--arch",
help=("The architecture to run tests for, " help=("The architecture to run tests for, "
"'auto' or 'native' for auto-detect"), "'auto' or 'native' for auto-detect"),
...@@ -663,15 +660,8 @@ def Main(args): ...@@ -663,15 +660,8 @@ def Main(args):
print "Unknown architecture %s" % options.arch print "Unknown architecture %s" % options.arch
return 1 return 1
if (bool(options.arch.startswith("android")) != if (options.device and not options.android_build_tools): # pragma: no cover
bool(options.android_build_tools)): # pragma: no cover print "Specifying a device requires Android build tools."
print ("Android architectures imply setting --android-build-tools and the "
"other way around.")
return 1
if (options.device and not
options.arch.startswith("android")): # pragma: no cover
print "Specifying a device requires an Android architecture to be used."
return 1 return 1
workspace = os.path.abspath(os.path.join(os.path.dirname(__file__), "..")) workspace = os.path.abspath(os.path.join(os.path.dirname(__file__), ".."))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment