Add ability to specify gyp dir to gyp_to_android.

When running gyp_to_android inside a Skia tree, it uses the gyp program
in third_party/externals. Inside an Android tree, we need to use a
different location for gyp (the Android copy of Skia, in external/skia,
does not contain third_party/externals).

The bot handles this by importing gyp_to_android and running its main
function directly.

Add command line arguments so a human can directly run gyp_to_android.

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

diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py
index aacbe98a0a5617af86c9ddd2991ad01397055bf7..e700f2fd846639867266dd031ee84c913fc3745d 100755 (executable)
--- a/platform_tools/android/bin/gyp_to_android.py
+++ b/platform_tools/android/bin/gyp_to_android.py
@@ -10,6 +10,7 @@ Script for generating the Android framework's version of Skia from gyp
 files.
 """
 
+import argparse
 import os
 import shutil
 import sys
@@ -197,4 +198,9 @@ def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None):
     shutil.rmtree(tmp_folder)
 
 if __name__ == '__main__':
-  main()
+  parser = argparse.ArgumentParser()
+  parser.add_argument('--gyp_source_dir', help='Source of gyp program. '
+                      'e.g. <path_to_skia>/third_party/externals/gyp')
+  args = parser.parse_args()
+
+  main(gyp_source_dir=args.gyp_source_dir)