Index: tools/generate_buildfiles.py |
diff --git a/tools/generate_buildfiles.py b/tools/generate_buildfiles.py |
index d7258e713a4d75474bb3cd6f632b77f9de09054c..27f6b7ed459e02074346bcfa6ad93d831f4e2ba7 100755 |
--- a/tools/generate_buildfiles.py |
+++ b/tools/generate_buildfiles.py |
@@ -12,14 +12,9 @@ import utils |
HOST_OS = utils.GuessOS() |
SCRIPT_DIR = os.path.dirname(sys.argv[0]) |
DART_ROOT = os.path.realpath(os.path.join(SCRIPT_DIR, '..')) |
-DART_USE_GYP = "DART_USE_GYP" |
DART_DISABLE_BUILDFILES = "DART_DISABLE_BUILDFILES" |
-def UseGyp(): |
- return DART_USE_GYP in os.environ |
- |
- |
def DisableBuildfiles(): |
return DART_DISABLE_BUILDFILES in os.environ |
@@ -84,16 +79,6 @@ def RunGn(options): |
return RunAndroidGn(options) |
-def RunGyp(options): |
- gyp_command = [ |
- 'python', |
- os.path.join(DART_ROOT, 'tools', 'gyp_dart.py'), |
- ] |
- if options.verbose: |
- print ' '.join(gyp_command) |
- return Execute(gyp_command) |
- |
- |
def ParseArgs(args): |
args = args[1:] |
parser = argparse.ArgumentParser( |
@@ -103,20 +88,8 @@ def ParseArgs(args): |
help='Verbose output.', |
default=False, |
action="store_true") |
- parser.add_argument("--gn", |
- help='Use GN', |
- default=not UseGyp(), |
- action='store_true') |
- parser.add_argument("--gyp", |
- help='Use gyp', |
- default=UseGyp(), |
- action='store_true') |
- |
- options = parser.parse_args(args) |
- # If gyp is enabled one way or another, then disable gn |
- if options.gyp: |
- options.gn = False |
- return options |
+ |
+ return parser.parse_args(args) |
def main(argv): |
@@ -124,10 +97,7 @@ def main(argv): |
if DisableBuildfiles(): |
return 0 |
options = ParseArgs(argv) |
- if options.gn: |
- return RunGn(options) |
- else: |
- return RunGyp(options) |
+ RunGn(options) |
if __name__ == '__main__': |