AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Pass gyp_source_dir to generate_tool.

Browse Source 
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
This commit is contained in:
scroggo 2014-12-12 09:01:55 -08:00 committed by Commit bot
parent e1157ab9ec
commit 09acfc8d1f
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
platform_tools/android/bin/gyp_to_android.py
View File

@ -145,7 +145,8 @@ def main(target_dir=None, require_sk_user_config=False, gyp_source_dir=None):
skia_lib_var_dict=common, skia_lib_var_dict=common,
local_module_name='skia_nanobench', local_module_name='skia_nanobench',
local_module_tags=['tests'], 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, tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
target_file='gm.gyp', 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, skia_lib_var_dict=common,
local_module_name='skia_gm', local_module_name='skia_gm',
local_module_tags=['tests'], 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, tool_makefile_writer.generate_tool(gyp_dir=tmp_folder,
target_file='dm.gyp', 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, skia_lib_var_dict=common,
local_module_name='skia_dm', local_module_name='skia_dm',
local_module_tags=['tests'], 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 # 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 # used to skip adding them to the tools makefiles, they are not needed in

6
platform_tools/android/gyp_gen/tool_makefile_writer.py
View File

@ -39,7 +39,7 @@ def write_tool_android_mk(target_dir, var_dict):
def generate_tool(gyp_dir, target_file, skia_trunk, dest_dir, def generate_tool(gyp_dir, target_file, skia_trunk, dest_dir,
skia_lib_var_dict, local_module_name, local_module_tags, 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. """Common steps for building one of the skia tools.
Parse a gyp file and create an Android.mk for this tool. 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_name: Name for this tool, to set as LOCAL_MODULE.
local_module_tags: Tags to pass to LOCAL_MODULE_TAG. local_module_tags: Tags to pass to LOCAL_MODULE_TAG.
desired_targets: List of targets to parse. desired_targets: List of targets to parse.
gyp_source_dir: Source directory for gyp.
""" """
result_file = android_framework_gyp.main(target_dir=gyp_dir, result_file = android_framework_gyp.main(target_dir=gyp_dir,
target_file=target_file, target_file=target_file,
skia_arch_type='other', skia_arch_type='other',
have_neon=False) have_neon=False,
gyp_source_dir=gyp_source_dir)
var_dict = vars_dict_lib.VarsDict() var_dict = vars_dict_lib.VarsDict()