diff options
| author |  scroggo <scroggo@google.com> | 2014-12-12 09:01:55 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-12-12 09:01:56 -0800 |
| commit | 09acfc8d1fd1723d01b7103f58a6f1502648f428 (patch) | |
| tree | 8eead8a7b78579a87fcce732815c1971b8b68ef8 /platform_tools | |
| parent | e1157ab9ecfb73797626255b1473be5d1c11cadf (diff) | |
Pass gyp_source_dir to generate_tool.
When generating the tool makefiles, which also calls
android_framework_gyp, we also need to pass the gyp directory.
TBR=borenet
NOTRY=True
NOTREECHECKS=True
BUG=skia:3233
Review URL: https://codereview.chromium.org/804473005
Diffstat (limited to 'platform_tools')
| -rwxr-xr-x | platform_tools/android/bin/gyp_to_android.py | 9 | ||||
| -rw-r--r-- | platform_tools/android/gyp_gen/tool_makefile_writer.py | 6 |
2 files changed, 10 insertions, 5 deletions
diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py index 34c81e1f5e..89b8d52d28 100755 --- a/platform_tools/android/bin/gyp_to_android.py +++ b/platform_tools/android/bin/gyp_to_android.py @@ -145,7 +145,8 @@ def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None): skia_lib_var_dict=common, local_module_name='skia_nanobench', local_module_tags=['tests'], - desired_targets=['nanobench']) + desired_targets=['nanobench'], + gyp_source_dir=gyp_source_dir) tool_makefile_writer.generate_tool(gyp_dir=tmp_folder, target_file='gm.gyp', @@ -154,7 +155,8 @@ def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None): skia_lib_var_dict=common, local_module_name='skia_gm', local_module_tags=['tests'], - desired_targets=['gm']) + desired_targets=['gm'], + gyp_source_dir=gyp_source_dir) tool_makefile_writer.generate_tool(gyp_dir=tmp_folder, target_file='dm.gyp', @@ -163,7 +165,8 @@ def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None): skia_lib_var_dict=common, local_module_name='skia_dm', local_module_tags=['tests'], - desired_targets=['dm']) + desired_targets=['dm'], + gyp_source_dir=gyp_source_dir) # Now that the defines have been written to SkUserConfig and they've been # used to skip adding them to the tools makefiles, they are not needed in diff --git a/platform_tools/android/gyp_gen/tool_makefile_writer.py b/platform_tools/android/gyp_gen/tool_makefile_writer.py index 2dacb042b6..897a2b8607 100644 --- a/platform_tools/android/gyp_gen/tool_makefile_writer.py +++ b/platform_tools/android/gyp_gen/tool_makefile_writer.py @@ -39,7 +39,7 @@ def write_tool_android_mk(target_dir, var_dict): def generate_tool(gyp_dir, target_file, skia_trunk, dest_dir, skia_lib_var_dict, local_module_name, local_module_tags, - desired_targets): + desired_targets, gyp_source_dir=None): """Common steps for building one of the skia tools. Parse a gyp file and create an Android.mk for this tool. @@ -57,11 +57,13 @@ def generate_tool(gyp_dir, target_file, skia_trunk, dest_dir, local_module_name: Name for this tool, to set as LOCAL_MODULE. local_module_tags: Tags to pass to LOCAL_MODULE_TAG. desired_targets: List of targets to parse. + gyp_source_dir: Source directory for gyp. """ result_file = android_framework_gyp.main(target_dir=gyp_dir, target_file=target_file, skia_arch_type='other', - have_neon=False) + have_neon=False, + gyp_source_dir=gyp_source_dir) var_dict = vars_dict_lib.VarsDict() |