Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(879)

Unified Diff: platform_tools/android/bin/gyp_to_android.py

Issue 804473005: Pass gyp_source_dir to generate_tool. (Closed) Base URL: https://skia.googlesource.com/skia.git@debugging
Patch Set: Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | platform_tools/android/gyp_gen/tool_makefile_writer.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: platform_tools/android/bin/gyp_to_android.py
diff --git a/platform_tools/android/bin/gyp_to_android.py b/platform_tools/android/bin/gyp_to_android.py
index 34c81e1f5e38c7ca23fbfdf4b573cde7cc69f964..89b8d52d28a1a8c8584bdd011ce97c8b3b99c9e0 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
« no previous file with comments | « no previous file | platform_tools/android/gyp_gen/tool_makefile_writer.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698